From c82ff436b86f67756e74d7159e515621cc73a6bc Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Sun, 20 Aug 2023 16:45:34 +0100
Subject: [PATCH 01/81] [New] Wi-Fi Recovery  Changes to be committed: 
 modified:   src/static/static/home/yi-hack-v5/script/configure_wifi.sh 
 modified:   src/static/static/home/yi-hack-v5/script/system.sh

---
 .../static/home/yi-hack-v5/script/configure_wifi.sh       | 8 ++++++++
 src/static/static/home/yi-hack-v5/script/system.sh        | 7 ++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/static/static/home/yi-hack-v5/script/configure_wifi.sh b/src/static/static/home/yi-hack-v5/script/configure_wifi.sh
index 29bb7e5..b81dd47 100755
--- a/src/static/static/home/yi-hack-v5/script/configure_wifi.sh
+++ b/src/static/static/home/yi-hack-v5/script/configure_wifi.sh
@@ -1,10 +1,18 @@
 #!/bin/sh
 
+# 0.4.1a
+
 function print_help {
     echo "configure_wifi.sh"
     echo "will be used on next boot"
 }
 
+if [ -f "/tmp/sd/recover/mtdblock2_recover.bin" ]; then
+	dd if=/tmp/sd/recover/mtdblock2_recover.bin of=/dev/mtdblock2 2>/dev/null
+	mv /tmp/sd/recover/mtdblock2_recover.bin /tmp/sd/recover/mtdblock2_recover_done.bin
+	reboot
+fi
+
 CFG_FILE=/tmp/configure_wifi.cfg
 if [ ! -f "$CFG_FILE" ]; then
     echo "configure_wifi.cfg not found"
diff --git a/src/static/static/home/yi-hack-v5/script/system.sh b/src/static/static/home/yi-hack-v5/script/system.sh
index 84ad7ab..42a49ff 100755
--- a/src/static/static/home/yi-hack-v5/script/system.sh
+++ b/src/static/static/home/yi-hack-v5/script/system.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# 0.4.0c
+# 0.4.1a
 
 CONF_FILE="etc/system.conf"
 
@@ -79,6 +79,11 @@ if [ -f /tmp/sd/recover/configure_wifi.cfg ]; then
 	sh $YI_HACK_PREFIX/script/configure_wifi.sh
 fi
 
+if [ -f "/tmp/sd/recover/mtdblock2_recover.bin" ]; then
+	sync
+	sh $YI_HACK_PREFIX/script/configure_wifi.sh
+fi
+
 $YI_HACK_PREFIX/script/check_conf.sh
 
 hostname -F $YI_HACK_PREFIX/etc/hostname

From 4d70c2bfca77cf917e31af179c75854930fbc794 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Thu, 24 Aug 2023 11:17:17 +0100
Subject: [PATCH 02/81] [New] Setting Merge  Changes to be committed: 
 modified:   src/static/static/home/yi-hack-v5/etc/camera.conf 	modified:  
 src/static/static/home/yi-hack-v5/etc/system.conf

---
 src/static/static/home/yi-hack-v5/etc/camera.conf | 12 +++++++++---
 src/static/static/home/yi-hack-v5/etc/system.conf | 13 ++++++++++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/static/static/home/yi-hack-v5/etc/camera.conf b/src/static/static/home/yi-hack-v5/etc/camera.conf
index 8919915..cffe2f8 100644
--- a/src/static/static/home/yi-hack-v5/etc/camera.conf
+++ b/src/static/static/home/yi-hack-v5/etc/camera.conf
@@ -1,9 +1,15 @@
 SWITCH_ON=yes
 SAVE_VIDEO_ON_MOTION=yes
-SENSITIVITY=low
-AI_HUMAN_DETECTION=no
-SOUND_DETECTION=no
+SENSITIVITY=high
+AI_HUMAN_DETECTION=yes
+SOUND_DETECTION=yes
 SOUND_SENSITIVITY=80
 LED=yes
 ROTATE=no
 IR=yes
+MOTION_DETECTION=yes
+AI_VEHICLE_DETECTION=no
+AI_ANIMAL_DETECTION=no
+FACE_DETECTION=no
+MOTION_TRACKING=no
+CRUISE=no
diff --git a/src/static/static/home/yi-hack-v5/etc/system.conf b/src/static/static/home/yi-hack-v5/etc/system.conf
index aa88ff6..40aeece 100644
--- a/src/static/static/home/yi-hack-v5/etc/system.conf
+++ b/src/static/static/home/yi-hack-v5/etc/system.conf
@@ -31,7 +31,18 @@ FTP_DIR=
 FTP_DIR_TREE=no
 FTP_USERNAME=
 FTP_PASSWORD=
-FTP_FILE_DELETE_AFTER_UPLOAD=yes
+FTP_FILE_DELETE_AFTER_UPLOAD=no
 CHECK_UPDATES=no
 SSH_PASSWORD=
 CRONTAB=
+RTSP_ALT=no
+SPEAKER_AUDIO=yes
+SNAPSHOT=yes
+SNAPSHOT_VIDEO=no
+SNAPSHOT_LOW=no
+TIMELAPSE=no
+TIMELAPSE_FTP=no
+TIMELAPSE_DT=60
+TIMELAPSE_VDT=
+TIME_OSD=no
+DEBUG_LOG=no

From 25db09f312d3f05f5ed64c81ec9f4ad5a5167f64 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Thu, 24 Aug 2023 11:34:00 +0100
Subject: [PATCH 03/81] [New] Backup before Wi-Fi recover  Changes to be
 committed: 	modified:  
 src/static/static/home/yi-hack-v5/script/configure_wifi.sh

---
 .../static/home/yi-hack-v5/script/configure_wifi.sh       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/static/static/home/yi-hack-v5/script/configure_wifi.sh b/src/static/static/home/yi-hack-v5/script/configure_wifi.sh
index b81dd47..b6d3f68 100755
--- a/src/static/static/home/yi-hack-v5/script/configure_wifi.sh
+++ b/src/static/static/home/yi-hack-v5/script/configure_wifi.sh
@@ -8,9 +8,11 @@ function print_help {
 }
 
 if [ -f "/tmp/sd/recover/mtdblock2_recover.bin" ]; then
-	dd if=/tmp/sd/recover/mtdblock2_recover.bin of=/dev/mtdblock2 2>/dev/null
-	mv /tmp/sd/recover/mtdblock2_recover.bin /tmp/sd/recover/mtdblock2_recover_done.bin
-	reboot
+    DATE=$(date '+%Y%m%d%H%M%S')
+    dd if=/dev/mtdblock2 of=/tmp/sd/recover/mtdblock2_prerecover_$DATE.bin 2>/dev/null
+    dd if=/tmp/sd/recover/mtdblock2_recover.bin of=/dev/mtdblock2 2>/dev/null
+    mv /tmp/sd/recover/mtdblock2_recover.bin /tmp/sd/recover/mtdblock2_recover_done.bin
+    reboot
 fi
 
 CFG_FILE=/tmp/configure_wifi.cfg

From 9a8871666fe542898cce1cc3c0dd5d5e5dd36e6f Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Fri, 25 Aug 2023 11:40:43 +0200
Subject: [PATCH 04/81] Restore feature to edit config files

---
 src/mqtt-config/mqtt-config/config.c      | 84 +++++++++++++++++++++++
 src/mqtt-config/mqtt-config/config.h      |  1 +
 src/mqtt-config/mqtt-config/mqtt-config.c |  5 ++
 3 files changed, 90 insertions(+)

diff --git a/src/mqtt-config/mqtt-config/config.c b/src/mqtt-config/mqtt-config/config.c
index 1e02ee1..66eeb06 100644
--- a/src/mqtt-config/mqtt-config/config.c
+++ b/src/mqtt-config/mqtt-config/config.c
@@ -2,6 +2,24 @@
 
 void (*fconf_handler)(const char* key, const char* value);
 
+void ucase(char *string) {
+    // Convert to upper case
+    char *s = string;
+    while (*s) {
+        *s = toupper((unsigned char) *s);
+        s++;
+    }
+}
+
+void lcase(char *string) {
+    // Convert to lower case
+    char *s = string;
+    while (*s) {
+        *s = tolower((unsigned char) *s);
+        s++;
+    }
+}
+
 void config_set_handler(void (*f)(const char* key, const char* value))
 {
     if (f != NULL)
@@ -30,6 +48,72 @@ void config_parse(FILE *fp)
     }
 }
 
+void config_replace(char *filename, char *key, char *value)
+{
+    char buf[MAX_LINE_LENGTH];
+    char oldkey[128];
+    char oldvalue[128];
+    char *line;
+    int parsed;
+    FILE *fps, *fpt;
+    char tmpFile[L_tmpnam + 1]; // Add +1 for the null character. 
+
+    lcase(filename);
+    ucase(key);
+
+    fps = fopen(filename, "r");
+    if (fps == NULL) {
+        printf("Can't open file \"%s\": %s\n", filename, strerror(errno));
+        return;
+    }
+
+    tmpnam(tmpFile);
+    fpt = fopen(tmpFile, "w");
+    if (fpt == NULL) {
+        printf("Can't open file \"%s\": %s\n", filename, strerror(errno));
+        return;
+    }
+
+    while (!feof(fps)) {
+        line = fgets(buf, MAX_LINE_LENGTH, fps);
+        if (line == NULL) break;
+        if (buf[0] != '#') {
+            parsed = sscanf(buf, "%[^=] = %s", oldkey, oldvalue);
+            if((parsed == 2) && (strcasecmp(key, oldkey) == 0)) {
+                sprintf(buf, "%s=%s\n", key, value);
+            }
+        }
+        fputs(buf, fpt);
+    }
+
+    fclose(fpt);
+    fclose(fps);
+
+    // Rename file (rename function is a cross-device link)
+    fps = fopen(filename, "w");
+    if (fps == NULL) {
+        printf("Can't open file \"%s\": %s\n", filename, strerror(errno));
+        return;
+    }
+
+    fpt = fopen(tmpFile, "r");
+    if (fpt == NULL) {
+        printf("Can't open file \"%s\": %s\n", filename, strerror(errno));
+        return;
+    }
+
+    while (!feof(fpt)) {
+        line = fgets(buf, MAX_LINE_LENGTH, fpt);
+        if (line == NULL) break;
+        fputs(buf, fps);
+    }
+
+    fclose(fpt);
+    fclose(fps);
+
+    remove(tmpFile);
+}
+
 FILE *open_conf_file(const char* filename)
 {
     FILE *fp;
diff --git a/src/mqtt-config/mqtt-config/config.h b/src/mqtt-config/mqtt-config/config.h
index cc0a9e5..cb070a4 100644
--- a/src/mqtt-config/mqtt-config/config.h
+++ b/src/mqtt-config/mqtt-config/config.h
@@ -11,5 +11,6 @@
 
 void config_set_handler(void (*f)(const char* key, const char* value));
 void config_parse(FILE *fp);
+void config_replace(char *filename, char *key, char *value);
 FILE *open_conf_file(const char* filename);
 void close_conf_file(FILE *fp);
diff --git a/src/mqtt-config/mqtt-config/mqtt-config.c b/src/mqtt-config/mqtt-config/mqtt-config.c
index 04e511c..50ebec3 100644
--- a/src/mqtt-config/mqtt-config/mqtt-config.c
+++ b/src/mqtt-config/mqtt-config/mqtt-config.c
@@ -60,6 +60,7 @@ void disconnect_callback(struct mosquitto *mosq, void *obj, int result)
 void message_callback(struct mosquitto *mosq, void *obj, const struct mosquitto_message *message)
 {
     char topic_prefix[MAX_LINE_LENGTH], topic[MAX_LINE_LENGTH], file[MAX_KEY_LENGTH], param[MAX_KEY_LENGTH];
+    char conf_file[256];
     char *slash;
     bool match = 0;
     int len;
@@ -148,6 +149,10 @@ void message_callback(struct mosquitto *mosq, void *obj, const struct mosquitto_
                 sprintf(cmd_line, "ipc_cmd %s %s", ipc_cmd_param, (char *) message->payload);
                 if (debug) printf("Running system command \"%s\"\n", cmd_line);
                 system(cmd_line);
+            } else {
+                sprintf(conf_file, "%s/%s.conf", CONF_FILE_PATH, file);
+                if (debug) fprintf(stderr, "Updating file \"%s\", parameter \"%s\" with value \"%s\"\n", file, param, (char *) message->payload);
+                config_replace(conf_file, param, message->payload);
             }
         }
     } else {

From 5c0e1f6d39f53edc84593ff1727380437532e75b Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Fri, 25 Aug 2023 11:45:19 +0200
Subject: [PATCH 05/81] Add flag to decrease binary size

---
 src/rRTSPServer/Makefile.rRTSPServer | 2 +-
 src/rRTSPServer/rRTSPServer.patch    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/rRTSPServer/Makefile.rRTSPServer b/src/rRTSPServer/Makefile.rRTSPServer
index d45bcf4..9cecfac 100755
--- a/src/rRTSPServer/Makefile.rRTSPServer
+++ b/src/rRTSPServer/Makefile.rRTSPServer
@@ -8,7 +8,7 @@ CPLUSPLUS_COMPILER =	$(CXX)
 CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -DBSD=1 $(CPPFLAGS) $(CXXFLAGS)
 OBJ =			o
 LINK =			$(CXX) -o
-LINK_OPTS =		-L. $(LDFLAGS)
+LINK_OPTS =		-Wl,--gc-sections -L. $(LDFLAGS)
 CONSOLE_LINK_OPTS =	$(LINK_OPTS)
 LIBRARY_LINK =		$(AR) cr 
 LIBRARY_LINK_OPTS =	
diff --git a/src/rRTSPServer/rRTSPServer.patch b/src/rRTSPServer/rRTSPServer.patch
index 71ba3bb..3c4f799 100755
--- a/src/rRTSPServer/rRTSPServer.patch
+++ b/src/rRTSPServer/rRTSPServer.patch
@@ -2,7 +2,7 @@ diff -Naur live.ori/config.linux-cross live/config.linux-cross
 --- live.ori/config.linux-cross	1970-01-01 01:00:00.000000000 +0100
 +++ live/config.linux-cross	2021-02-18 10:39:28.103846011 +0100
 @@ -0,0 +1,17 @@
-+COMPILE_OPTS =		$(INCLUDES) -I. -O1 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DNO_OPENSSL=1 -DNEWLOCALE_NOT_USED
++COMPILE_OPTS =		$(INCLUDES) -I. -O1 -ffunction-sections -fdata-sections -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DNO_OPENSSL=1 -DNEWLOCALE_NOT_USED
 +C =			c
 +C_COMPILER =		$(CC)
 +C_FLAGS =		$(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS)
@@ -11,7 +11,7 @@ diff -Naur live.ori/config.linux-cross live/config.linux-cross
 +CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -DBSD=1 $(CPPFLAGS) $(CXXFLAGS)
 +OBJ =			o
 +LINK =			$(CXX) -o
-+LINK_OPTS =		-L. $(LDFLAGS)
++LINK_OPTS =		-Wl,--gc-sections -L. $(LDFLAGS)
 +CONSOLE_LINK_OPTS =	$(LINK_OPTS)
 +LIBRARY_LINK =		$(AR) cr 
 +LIBRARY_LINK_OPTS =	

From 381b840bf043e8c02331fb0d95ff4e19e679093e Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Fri, 25 Aug 2023 11:46:10 +0200
Subject: [PATCH 06/81] Remove old patch

---
 src/rRTSPServer/init.rRTSPServer   |  1 -
 src/rRTSPServer/rRTSPServer2.patch | 37 ------------------------------
 2 files changed, 38 deletions(-)
 delete mode 100755 src/rRTSPServer/rRTSPServer2.patch

diff --git a/src/rRTSPServer/init.rRTSPServer b/src/rRTSPServer/init.rRTSPServer
index 1567571..4751ee1 100755
--- a/src/rRTSPServer/init.rRTSPServer
+++ b/src/rRTSPServer/init.rRTSPServer
@@ -30,7 +30,6 @@ fi
 tar zxvf $ARCHIVE
 
 patch -p0 < rRTSPServer.patch
-patch -p0 < rRTSPServer2.patch
 
 cd live || exit 1
 
diff --git a/src/rRTSPServer/rRTSPServer2.patch b/src/rRTSPServer/rRTSPServer2.patch
deleted file mode 100755
index beb531d..0000000
--- a/src/rRTSPServer/rRTSPServer2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur include.ori/ADTSAudioFifoServerMediaSubsession.hh include/ADTSAudioFifoServerMediaSubsession.hh
---- include.ori/ADTSAudioFifoServerMediaSubsession.hh	2023-04-15 23:22:04.964120526 +0200
-+++ include/ADTSAudioFifoServerMediaSubsession.hh	2023-04-20 19:18:14.115207781 +0200
-@@ -54,6 +54,8 @@
- private:
-     char* fAuxSDPLine;
-     char fDoneFlag; // used when setting up "fAuxSDPLine"
-+    unsigned fSamplingFrequency;
-+    unsigned fNumChannels;
-     char fConfigStr[5];
-     RTPSink* fDummyRTPSink; // ditto
-     StreamReplicator *fReplicator;
-diff -Naur src.ori/ADTSAudioFifoServerMediaSubsession.cpp src/ADTSAudioFifoServerMediaSubsession.cpp
---- src.ori/ADTSAudioFifoServerMediaSubsession.cpp	2023-04-15 23:22:04.964120526 +0200
-+++ src/ADTSAudioFifoServerMediaSubsession.cpp	2023-04-20 21:46:20.842280500 +0200
-@@ -128,6 +128,8 @@
-         Medium::close(resultSource);
-         return NULL;
-     } else {
-+        fSamplingFrequency = originalSource->samplingFrequency();
-+        fNumChannels = originalSource->numChannels();
-         sprintf(fConfigStr, originalSource->configStr());
-         if (debug & 4) fprintf(stderr, "createStreamReplica completed successfully\n");
- 
-@@ -139,10 +141,9 @@
- ::createNewRTPSink(Groupsock* rtpGroupsock,
- 		   unsigned char rtpPayloadTypeIfDynamic,
- 		   FramedSource* inputSource) {
--  ADTSAudioFifoSource* adtsSource = (ADTSAudioFifoSource*)inputSource;
-   return MPEG4GenericRTPSink::createNew(envir(), rtpGroupsock,
- 					rtpPayloadTypeIfDynamic,
--					adtsSource->samplingFrequency(),
-+					fSamplingFrequency,
- 					"audio", "AAC-hbr", fConfigStr,
--					adtsSource->numChannels());
-+					fNumChannels);
- }

From f5e97ce30d01cf6b41081c7f2a4ca3741f19bab9 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Fri, 25 Aug 2023 11:46:57 +0200
Subject: [PATCH 07/81] Decrease RTP packet length

---
 src/rRTSPServer/rRTSPServer.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rRTSPServer/rRTSPServer.patch b/src/rRTSPServer/rRTSPServer.patch
index 3c4f799..0ec3ef1 100755
--- a/src/rRTSPServer/rRTSPServer.patch
+++ b/src/rRTSPServer/rRTSPServer.patch
@@ -2,7 +2,7 @@ diff -Naur live.ori/config.linux-cross live/config.linux-cross
 --- live.ori/config.linux-cross	1970-01-01 01:00:00.000000000 +0100
 +++ live/config.linux-cross	2021-02-18 10:39:28.103846011 +0100
 @@ -0,0 +1,17 @@
-+COMPILE_OPTS =		$(INCLUDES) -I. -O1 -ffunction-sections -fdata-sections -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DNO_OPENSSL=1 -DNEWLOCALE_NOT_USED
++COMPILE_OPTS =		$(INCLUDES) -I. -O1 -ffunction-sections -fdata-sections -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DNO_OPENSSL=1 -DRTP_PAYLOAD_MAX_SIZE=1352 -DNEWLOCALE_NOT_USED
 +C =			c
 +C_COMPILER =		$(CC)
 +C_FLAGS =		$(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS)

From 9897afc09df6e08870401341e53262bc5a3be558 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Fri, 25 Aug 2023 11:47:46 +0200
Subject: [PATCH 08/81] Improve sync/async read

---
 src/rRTSPServer/src/ADTSAudioFifoSource.cpp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/rRTSPServer/src/ADTSAudioFifoSource.cpp b/src/rRTSPServer/src/ADTSAudioFifoSource.cpp
index 528d730..d706cd5 100755
--- a/src/rRTSPServer/src/ADTSAudioFifoSource.cpp
+++ b/src/rRTSPServer/src/ADTSAudioFifoSource.cpp
@@ -56,19 +56,33 @@ ADTSAudioFifoSource::createNew(UsageEnvironment& env, char const* fileName) {
         };
 
         // Clean fifo content
+#ifdef READ_FROM_FILES_SYNCHRONOUSLY
+        if (debug & 4) fprintf(stderr, "Read synchronously\n");
         while (fread(null, 1, sizeof(null), fid) > 0) {}
+#else
+        if (debug & 4) fprintf(stderr, "Read asynchronously\n");
+        while (read(fileno(fid), null, sizeof(null)) > 0) {}
+#endif
 
         // Restore old blocking
         if (fcntl(fileno(fid), F_SETFL, flags) != 0) {
             fclose(fid);
             break;
-        };
+        }
 
         unsigned char fixedHeader[7];
         while (1) {
+#ifdef READ_FROM_FILES_SYNCHRONOUSLY
             fread(fixedHeader, 1, 1, fid);
+#else
+            read(fileno(fid), fixedHeader, 1);
+#endif
             if (fixedHeader[0] == 0xFF) {
+#ifdef READ_FROM_FILES_SYNCHRONOUSLY
                 fread(&fixedHeader[1], 1, 1, fid);
+#else
+                read(fileno(fid), &fixedHeader[1], 1);
+#endif
                 // Check the 'syncword':
                 if ((fixedHeader[1]&0xF0) == 0xF0) {
                     break;
@@ -76,7 +90,11 @@ ADTSAudioFifoSource::createNew(UsageEnvironment& env, char const* fileName) {
             }
             usleep(10000);
         }
+#ifdef READ_FROM_FILES_SYNCHRONOUSLY
         fread(&fixedHeader[2], 1, 5, fid);
+#else
+        read(fileno(fid), &fixedHeader[2], 5);
+#endif
         u_int16_t frame_length = ((fixedHeader[3]&0x03)<<11) | (fixedHeader[4]<<3) | ((fixedHeader[5]&0xE0)>>5);
 
         // Get and check the 'profile':

From d29169e3cceb7765e9ffb182a3663b3ec51bfc0b Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Fri, 25 Aug 2023 12:44:22 +0200
Subject: [PATCH 09/81] Update gitignore

---
 src/snapshot/.gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/snapshot/.gitignore b/src/snapshot/.gitignore
index 9cd7c97..9ca2b40 100644
--- a/src/snapshot/.gitignore
+++ b/src/snapshot/.gitignore
@@ -1,8 +1,8 @@
 # Ignore the install dir
 _install/
 snapshot/SDK
-snapshot/jpeg-9c
-snapshot/ffmpeg-4.0.4
+snapshot/jpeg-9e
+snapshot/ffmpeg-6.0
 snapshot/add_water.o
 snapshot/convert2jpg.o
 snapshot/imggrabber

From 70a78bd9ba275af44f93c4d11928b92af4a6d87c Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Fri, 25 Aug 2023 12:45:30 +0200
Subject: [PATCH 10/81] New features: disable, force low and already running

---
 src/snapshot/snapshot/imggrabber.c | 65 +++++++++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/src/snapshot/snapshot/imggrabber.c b/src/snapshot/snapshot/imggrabber.c
index 67f3b95..9f8f380 100644
--- a/src/snapshot/snapshot/imggrabber.c
+++ b/src/snapshot/snapshot/imggrabber.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 roleo.
+ * Copyright (c) 2023 roleo.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/mman.h>
+#include <dirent.h>
 #include <stdint.h>
 #include <inttypes.h>
 #include <sys/types.h>
@@ -314,6 +315,49 @@ int add_watermark(char *buffer, int width, int height)
     return 0;
 }
 
+pid_t proc_find(const char* process_name, pid_t process_pid)
+{
+    DIR* dir;
+    struct dirent* ent;
+    char* endptr;
+    char buf[512];
+
+    if (!(dir = opendir("/proc"))) {
+        perror("can't open /proc");
+        return -1;
+    }
+
+    while((ent = readdir(dir)) != NULL) {
+        /* if endptr is not a null character, the directory is not
+         * entirely numeric, so ignore it */
+        long lpid = strtol(ent->d_name, &endptr, 10);
+        if (*endptr != '\0') {
+            continue;
+        }
+
+        /* try to open the cmdline file */
+        snprintf(buf, sizeof(buf), "/proc/%ld/cmdline", lpid);
+        FILE* fp = fopen(buf, "r");
+
+        if (fp) {
+            if (fgets(buf, sizeof(buf), fp) != NULL) {
+                /* check the first token in the file, the program name */
+                char* first = strtok(buf, " ");
+                if ((strcmp(first, process_name) == 0) && ((pid_t) lpid != process_pid)) {
+                    fclose(fp);
+                    closedir(dir);
+                    return (pid_t) lpid;
+                }
+            }
+            fclose(fp);
+        }
+
+    }
+
+    closedir(dir);
+    return -1;
+}
+
 void print_usage(char *prog_name)
 {
     fprintf(stderr, "Usage: %s [options]\n", prog_name);
@@ -614,6 +658,25 @@ int main(int argc, char **argv) {
 
     if (debug) fprintf(stderr, "Starting program\n");
 
+    // Check if snapshot is disabled
+    if (access("/tmp/snapshot.disabled", F_OK ) == 0 ) {
+        fprintf(stderr, "Snapshot is disabled\n");
+        return 0;
+    }
+
+    // Check if snapshot is low res
+    if (access("/tmp/snapshot.low", F_OK ) == 0 ) {
+        fprintf(stderr, "Snapshot is low res\n");
+        resolution = RESOLUTION_LOW;
+    }
+
+    // Check if the process is already running
+    pid_t my_pid = getpid();
+    if (proc_find(basename(argv[0]), my_pid) != -1) {
+        fprintf(stderr, "Process is already running\n");
+        return 0;
+    }
+
     if (resolution == RESOLUTION_LOW) {
         table_offset = table_low_offset;
         stream_offset = stream_low_offset;

From d19971d4933f1addc75192ad786e3a120ba02729 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Fri, 25 Aug 2023 12:49:09 +0200
Subject: [PATCH 11/81] Remove unused settings from config files

---
 src/static/static/home/yi-hack-v5/etc/mqttv4.conf |  8 ++------
 .../static/home/yi-hack-v5/script/check_conf.sh   | 15 ---------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/static/static/home/yi-hack-v5/etc/mqttv4.conf b/src/static/static/home/yi-hack-v5/etc/mqttv4.conf
index e601173..4dcbf24 100644
--- a/src/static/static/home/yi-hack-v5/etc/mqttv4.conf
+++ b/src/static/static/home/yi-hack-v5/etc/mqttv4.conf
@@ -24,9 +24,8 @@ MQTT_PREFIX=yicam
 TOPIC_BIRTH_WILL=status
 TOPIC_MOTION=motion_detection
 TOPIC_MOTION_IMAGE=motion_detection_image
+MOTION_IMAGE_DELAY=0.5
 TOPIC_MOTION_FILES=motion_files
-TOPIC_AI_HUMAN_DETECTION=ai_human_detection
-TOPIC_BABY_CRYING=baby_crying
 TOPIC_SOUND_DETECTION=sound_detection
 
 # -----------------------------------------------------------------------------
@@ -37,9 +36,8 @@ BIRTH_MSG=online
 WILL_MSG=offline
 MOTION_START_MSG=motion_start
 MOTION_STOP_MSG=motion_stop
-AI_HUMAN_DETECTION_MSG=human
 BABY_CRYING_MSG=crying
-SOUND_DETECTION_MSG=sound
+SOUND_DETECTION_MSG=sound_detected
 
 # -----------------------------------------------------------------------------
 # Other settings
@@ -51,6 +49,4 @@ MQTT_RETAIN_BIRTH_WILL=1
 MQTT_RETAIN_MOTION=0
 MQTT_RETAIN_MOTION_IMAGE=0
 MQTT_RETAIN_MOTION_FILES=0
-MQTT_RETAIN_AI_HUMAN_DETECTION=0
-MQTT_RETAIN_BABY_CRYING=0
 MQTT_RETAIN_SOUND_DETECTION=0
diff --git a/src/static/static/home/yi-hack-v5/script/check_conf.sh b/src/static/static/home/yi-hack-v5/script/check_conf.sh
index 834e56a..cd71161 100755
--- a/src/static/static/home/yi-hack-v5/script/check_conf.sh
+++ b/src/static/static/home/yi-hack-v5/script/check_conf.sh
@@ -14,23 +14,13 @@ DISABLE_CLOUD=no
 REC_WITHOUT_CLOUD=no
 MQTT=no
 RTSP=no
-RTSP_ALT=no
 RTSP_STREAM=high
 RTSP_AUDIO=no
-SPEAKER_AUDIO=yes
-SNAPSHOT=yes
-SNAPSHOT_VIDEO=no
-SNAPSHOT_LOW=no
-TIMELAPSE=no
-TIMELAPSE_FTP=no
-TIMELAPSE_DT=60
-TIMELAPSE_VDT=
 ONVIF=no
 ONVIF_WSDD=yes
 ONVIF_PROFILE=high
 ONVIF_NETIF=wlan0
 ONVIF_WM_SNAPSHOT=yes
-TIME_OSD=no
 NTPD=yes
 NTP_SERVER=pool.ntp.org
 PROXYCHAINSNG=no
@@ -82,15 +72,11 @@ TOPIC_MOTION=motion_detection
 TOPIC_MOTION_IMAGE=motion_detection_image
 MOTION_IMAGE_DELAY=0.5
 TOPIC_MOTION_FILES=motion_files
-TOPIC_AI_HUMAN_DETECTION=ai_human_detection   
 TOPIC_SOUND_DETECTION=sound_detection
 BIRTH_MSG=online
 WILL_MSG=offline
 MOTION_START_MSG=motion_start
 MOTION_STOP_MSG=motion_stop
-AI_HUMAN_DETECTION_MSG=human
-AI_VEHICLE_DETECTION_MSG=vehicle
-AI_ANIMAL_DETECTION_MSG=animal
 BABY_CRYING_MSG=crying
 SOUND_DETECTION_MSG=sound_detected
 MQTT_KEEPALIVE=120
@@ -99,7 +85,6 @@ MQTT_RETAIN_BIRTH_WILL=1
 MQTT_RETAIN_MOTION=0
 MQTT_RETAIN_MOTION_IMAGE=0
 MQTT_RETAIN_MOTION_FILES=0
-MQTT_RETAIN_AI_HUMAN_DETECTION=0
 MQTT_RETAIN_SOUND_DETECTION=0"
 
 if [ ! -f $SYSTEM_CONF_FILE ]; then

From c7034e24c88b105183cdb1b802ec9d4445b6d963 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Fri, 25 Aug 2023 12:49:57 +0200
Subject: [PATCH 12/81] Add options to disable snapshot and force low res

---
 .../static/home/yi-hack-v5/etc/system.conf    |  2 ++
 .../home/yi-hack-v5/script/check_conf.sh      |  2 ++
 .../static/home/yi-hack-v5/script/system.sh   |  8 ++++++
 .../httpd/htdocs/pages/configurations.html    | 28 +++++++++++++++++++
 4 files changed, 40 insertions(+)

diff --git a/src/static/static/home/yi-hack-v5/etc/system.conf b/src/static/static/home/yi-hack-v5/etc/system.conf
index aa88ff6..562bf1f 100644
--- a/src/static/static/home/yi-hack-v5/etc/system.conf
+++ b/src/static/static/home/yi-hack-v5/etc/system.conf
@@ -14,6 +14,8 @@ ONVIF_WSDD=no
 ONVIF_PROFILE=high
 ONVIF_NETIF=wlan0
 ONVIF_WM_SNAPSHOT=no
+SNAPSHOT=yes
+SNAPSHOT_LOW=no
 NTPD=no
 NTP_SERVER=pool.ntp.org
 PROXYCHAINSNG=no
diff --git a/src/static/static/home/yi-hack-v5/script/check_conf.sh b/src/static/static/home/yi-hack-v5/script/check_conf.sh
index cd71161..0c9a350 100755
--- a/src/static/static/home/yi-hack-v5/script/check_conf.sh
+++ b/src/static/static/home/yi-hack-v5/script/check_conf.sh
@@ -21,6 +21,8 @@ ONVIF_WSDD=yes
 ONVIF_PROFILE=high
 ONVIF_NETIF=wlan0
 ONVIF_WM_SNAPSHOT=yes
+SNAPSHOT=yes
+SNAPSHOT_LOW=no
 NTPD=yes
 NTP_SERVER=pool.ntp.org
 PROXYCHAINSNG=no
diff --git a/src/static/static/home/yi-hack-v5/script/system.sh b/src/static/static/home/yi-hack-v5/script/system.sh
index 84ad7ab..d934ab2 100755
--- a/src/static/static/home/yi-hack-v5/script/system.sh
+++ b/src/static/static/home/yi-hack-v5/script/system.sh
@@ -249,6 +249,14 @@ if [[ $(get_config ONVIF_WM_SNAPSHOT) == "yes" ]] ; then
     WATERMARK="&watermark=yes"
 fi
 
+if [[ $(get_config SNAPSHOT) == "no" ]] ; then
+    touch /tmp/snapshot.disabled
+fi
+
+if [[ $(get_config SNAPSHOT_LOW) == "yes" ]] ; then
+    touch /tmp/snapshot.low
+fi
+
 RRTSP_MODEL=$MODEL_SUFFIX
 RRTSP_RES=$(get_config RTSP_STREAM)
 RRTSP_AUDIO=$(get_config RTSP_AUDIO)
diff --git a/src/www/httpd/htdocs/pages/configurations.html b/src/www/httpd/htdocs/pages/configurations.html
index 1249f0a..989e240 100644
--- a/src/www/httpd/htdocs/pages/configurations.html
+++ b/src/www/httpd/htdocs/pages/configurations.html
@@ -172,6 +172,34 @@ <h4 class="no-margin">General</h4>
                             </span>
                         </td>
                     </tr>
+                    <tr class="row">
+                        <td>Snapshot</td>
+                        <td>
+                            <label class="switch small">
+                                <input type="checkbox" data-key="SNAPSHOT"/>
+                                <span class="slider round"></span>
+                                <span class="switch-text"></span>
+                            </label>
+                            <span class="switch-description">
+                                Enable snapshot feature.
+                                <br/>
+                                If you want to use this feature, enable swap file to avoid memory problems.
+                            </span>
+                        </td>
+                    </tr>
+                    <tr class="row">
+                        <td>Force low resolution snapshot</td>
+                        <td>
+                            <label class="switch small">
+                                <input type="checkbox" data-key="SNAPSHOT_LOW"/>
+                                <span class="slider round"></span>
+                                <span class="switch-text"></span>
+                            </label>
+                            <span class="switch-description">
+                                Take low resolution snapshots only (useful for avoiding memory problems).
+                            </span>
+                        </td>
+                    </tr>
                     </tbody>
                 </table>
             </div>

From fcb3bc313482d30c3293fb8a5830f678ba4ba565 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Fri, 25 Aug 2023 12:50:39 +0200
Subject: [PATCH 13/81] Remove unused mqtt options

---
 src/www/httpd/htdocs/pages/mqtt.html | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/www/httpd/htdocs/pages/mqtt.html b/src/www/httpd/htdocs/pages/mqtt.html
index 3dc3326..5aace03 100644
--- a/src/www/httpd/htdocs/pages/mqtt.html
+++ b/src/www/httpd/htdocs/pages/mqtt.html
@@ -130,16 +130,20 @@ <h4 class="no-margin">Topics</h4>
                             <input class="u-full-width" type="text" placeholder="" id="motion_start_msg" data-key="MOTION_START_MSG"/>
                             <label for="motion_stop_msg">Motion Stop Message</label>
                             <input class="u-full-width" type="text" placeholder="" id="motion_stop_msg" data-key="MOTION_STOP_MSG"/>
+                            <label for="baby_crying_msg">Baby Crying Message</label>
+                            <input class="u-full-width" type="text" placeholder="" id="baby_crying_msg" data-key="BABY_CRYING_MSG"/>
                             <label for="topic_motion_image">Topic Suffix for jpeg image</label>
                             <input class="u-full-width" type="text" placeholder="" id="topic_motion_image" data-key="TOPIC_MOTION_IMAGE"/>
                             <span class="switch-description">
                                 A raw jpeg image is sent to this topic when a motion is detected.
                             </span>
+                            <label for="motion_image_delay">Delay between motion detection and snapshot (s)</label>
+                            <input class="u-full-width" type="text" placeholder="" id="motion_image_delay" data-key="MOTION_IMAGE_DELAY">
                             <label for="topic_motion_files">Topic Suffix for video list message</label>
                             <input class="u-full-width" type="text" placeholder="" id="topic_motion_files" data-key="TOPIC_MOTION_FILES">
                         </td>
                     </tr>
-                    <tr class="row">
+<!--                    <tr class="row">
                         <td>AI Human Detection</td>
                         <td>
                             <label for="topic_ai_human_detection">Topic Suffix</label>
@@ -147,7 +151,7 @@ <h4 class="no-margin">Topics</h4>
                             <label for="ai_human_detection_msg">AI Human Detection Message</label>
                             <input class="u-full-width" type="text" placeholder="" id="ai_human_detection_msg" data-key="AI_HUMAN_DETECTION_MSG"/>
                         </td>
-                    </tr>
+                    </tr> -->
                     <tr class="row">
                         <td>Sound Detection</td>
                         <td>
@@ -157,7 +161,7 @@ <h4 class="no-margin">Topics</h4>
                             <input class="u-full-width" type="text" placeholder="" id="sound_detection_msg" data-key="SOUND_DETECTION_MSG"/>
                         </td>
                     </tr>
-                    <tr class="row">
+<!--                    <tr class="row">
                         <td>Baby Crying</td>
                         <td>
                             <label for="topic_baby_crying">Topic Suffix</label>
@@ -177,7 +181,7 @@ <h4 class="no-margin">Topics</h4>
                                 Leave empty if you don't want to start the mqtt config process.
                             </span>
                         </td>
-                    </tr>
+                    </tr> -->
                     </tbody>
                 </table>
             </div>
@@ -242,7 +246,7 @@ <h4 class="no-margin">Advanced</h4>
                             </span>
                         </td>
                     </tr>
-                    <tr class="row">
+<!--                    <tr class="row">
                         <td>Retain for AI Human Detection messages</td>
                         <td>
                             <input class="u-full-width" type="text" placeholder="1" data-key="MQTT_RETAIN_AI_HUMAN_DETECTION"/>
@@ -250,7 +254,7 @@ <h4 class="no-margin">Advanced</h4>
                                 A retained message is a normal MQTT message with the retained flag set to true. The broker stores the last retained message and the corresponding QoS for that topic. (1 = enabled, 0 = disabled)
                             </span>
                         </td>
-                    </tr>
+                    </tr> -->
                     <tr class="row">
                         <td>Retain for Sound Detection messages</td>
                         <td>

From 2dc4cfa895413867f7bdc3b71e594c322d47401c Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Sat, 26 Aug 2023 14:53:32 +0200
Subject: [PATCH 14/81] Fix and improve h264grabber

---
 src/h264grabber/h264grabber/h264grabber.c | 44 ++++++++++++++++++-----
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/h264grabber/h264grabber/h264grabber.c b/src/h264grabber/h264grabber/h264grabber.c
index c8815bc..55c4ec8 100644
--- a/src/h264grabber/h264grabber/h264grabber.c
+++ b/src/h264grabber/h264grabber/h264grabber.c
@@ -214,7 +214,7 @@ int main(int argc, char **argv) {
     FILE *fFid = NULL;
     FILE *fOut = NULL;
 
-    int current_frame, frame_counter, frame_counter_tmp, next_frame_counter;
+    int current_frame, frame_counter, frame_counter_tmp, next_frame_counter, frame_start, next_frame_start;
     int table_offset, stream_offset;
     unsigned int frame_ts = 0;
     unsigned int frame_ts_tmp, next_frame_ts, frame_ts_diff;
@@ -573,17 +573,24 @@ int main(int argc, char **argv) {
             for (i = 0; i < table_record_num; i++) {
                 // Get pointer to the record
                 record_ptr = addr + table_offset + (i * table_record_size);
+                // Get the frame start and check if '01'
+                frame_start = (int) *(record_ptr);
+                if (frame_start != 1) continue;
                 // Get the frame counter
                 frame_counter_tmp = (((int) *(record_ptr + frame_counter_offset + 1)) << 8) +
                             ((int) *(record_ptr + frame_counter_offset));
                 // Check if it is the largest frame_counter
                 if (frame_counter_tmp > frame_counter) {
                     frame_counter = frame_counter_tmp;
-                } else {
                     current_frame = i;
+                } else {
                     break;
                 }
             }
+            if (current_frame == -1) {
+                usleep(MILLIS_10);
+                continue;
+            }
             if (debug) fprintf(stderr, "%lld - found latest frame: id %d, frame_counter %d\n", current_timestamp(), current_frame, frame_counter);
 
             // Wait 10 milliseconds
@@ -601,6 +608,12 @@ int main(int argc, char **argv) {
                 } else {
                     next_record_ptr = record_ptr + table_record_size;
                 }
+                // Get the frame start and check if '01'
+                next_frame_start = (int) *(next_record_ptr);
+                if (next_frame_start != 1) {
+                    usleep(MILLIS_10);
+                    continue;
+                }
                 // Get the frame counter of the next record
                 next_frame_counter = ((int) *(next_record_ptr + frame_counter_offset + 1)) * 256 + ((int) *(next_record_ptr + frame_counter_offset));
                 if (debug) fprintf(stderr, "%lld - current frame counter is %d, next frame counter is %d\n", current_timestamp(), frame_counter, next_frame_counter);
@@ -635,7 +648,7 @@ int main(int argc, char **argv) {
                 } else {
                     frame_counter_invalid++;
                     if (frame_counter_invalid < 10) {
-                        if (debug) fprintf(stderr, "%lld - frame counter invalid %d\n", current_timestamp(), frame_counter_invalid);
+                        if (debug) fprintf(stderr, "%lld - frame counter invalid %d, wait for the next frame\n", current_timestamp(), frame_counter_invalid);
                     } else {
                         if (debug) fprintf(stderr, "%lld - frame counter invalid %d, sync lost\n", current_timestamp(), frame_counter_invalid);
                         break;
@@ -650,10 +663,13 @@ int main(int argc, char **argv) {
         for(;;) {
             // Find the record with the largest timestamp
             current_frame = -1;
-            frame_counter = -1;
+            frame_ts = 0;
             for (i = 0; i < table_record_num; i++) {
                 // Get pointer to the record
                 record_ptr = addr + table_offset + (i * table_record_size);
+                // Get the frame start and check if '01'
+                frame_start = (int) *(record_ptr);
+                if (frame_start != 1) continue;
                 // Get the frame timestamp
                 frame_ts_tmp = (((int) *(record_ptr + frame_ts_offset + 3)) << 24) +
                             (((int) *(record_ptr + frame_ts_offset + 2)) << 16) +
@@ -662,11 +678,15 @@ int main(int argc, char **argv) {
                 // Check if it is the largest timestamp
                 if (frame_ts_tmp > frame_ts) {
                     frame_ts = frame_ts_tmp;
-                } else {
                     current_frame = i;
+                } else {
                     break;
                 }
             }
+            if (current_frame == -1) {
+                usleep(MILLIS_10);
+                continue;
+            }
             if (debug) fprintf(stderr, "%lld - found latest frame: id %d, frame_ts %u\n", current_timestamp(), current_frame, frame_ts);
 
             // Wait 10 milliseconds
@@ -684,18 +704,24 @@ int main(int argc, char **argv) {
                 } else {
                     next_record_ptr = record_ptr + table_record_size;
                 }
+                // Get the frame start and check if '01'
+                next_frame_start = (int) *(next_record_ptr);
+                if (next_frame_start != 1) {
+                    usleep(MILLIS_10);
+                    continue;
+                }
                 // Get the frame timestamp of the next record
                 next_frame_ts = (((int) *(next_record_ptr + frame_ts_offset + 3)) << 24) +
                             (((int) *(next_record_ptr + frame_ts_offset + 2)) << 16) +
                             (((int) *(next_record_ptr + frame_ts_offset + 1)) << 8) +
                             ((int) *(next_record_ptr + frame_ts_offset));
-                if (debug) fprintf(stderr, "%lld - current frame timestamp is %u, next frame timestamp is %u\n", current_timestamp(), frame_ts, next_frame_ts);
+                if (debug) fprintf(stderr, "%lld - current frame timestamp is %u, next frame timestamp is %u, duration is %u\n", current_timestamp(), frame_ts, next_frame_ts, next_frame_ts - frame_ts);
                 // Check if the frame timestamp is valid
                 if (next_frame_ts >= frame_ts)
                     frame_ts_diff = next_frame_ts - frame_ts;
                 else
                     frame_ts_diff = next_frame_ts + (0xffffffff - frame_ts + 1);
-                if ((frame_ts_diff >= 0) && (frame_ts_diff <= 10 * 64)) {    // 1 packet with 1024 samples every 64 ms
+                if ((frame_ts_diff >= 0) && (frame_ts_diff <= 2 * 128)) {    // 1 packet with 1024 samples every 128 ms
                     // Get the offset of the stream
                     frame_offset = (((int) *(record_ptr + frame_offset_offset + 3)) << 24) +
                                 (((int) *(record_ptr + frame_offset_offset + 2)) << 16) +
@@ -724,9 +750,9 @@ int main(int argc, char **argv) {
                 } else {
                     frame_counter_invalid++;
                     if (frame_counter_invalid < 10) {
-                        if (debug) fprintf(stderr, "%lld - frame counter invalid %d\n", current_timestamp(), frame_counter_invalid);
+                        if (debug) fprintf(stderr, "%lld - frame timestamp invalid %d, wait for the next frame\n", current_timestamp(), frame_counter_invalid);
                     } else {
-                        if (debug) fprintf(stderr, "%lld - frame counter invalid %d, sync lost\n", current_timestamp(), frame_counter_invalid);
+                        if (debug) fprintf(stderr, "%lld - frame timestamp invalid %d, sync lost\n", current_timestamp(), frame_counter_invalid);
                         break;
                     }
                 }

From 6ce47e243809f55bf4df60f9f5b5eadec930b2ad Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Sat, 26 Aug 2023 14:54:43 +0200
Subject: [PATCH 15/81] Fix system.conf parameters

---
 src/static/static/home/yi-hack-v5/etc/camera.conf      |  2 +-
 src/static/static/home/yi-hack-v5/script/check_conf.sh | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/static/static/home/yi-hack-v5/etc/camera.conf b/src/static/static/home/yi-hack-v5/etc/camera.conf
index 8919915..f05ae90 100644
--- a/src/static/static/home/yi-hack-v5/etc/camera.conf
+++ b/src/static/static/home/yi-hack-v5/etc/camera.conf
@@ -1,9 +1,9 @@
 SWITCH_ON=yes
 SAVE_VIDEO_ON_MOTION=yes
 SENSITIVITY=low
-AI_HUMAN_DETECTION=no
 SOUND_DETECTION=no
 SOUND_SENSITIVITY=80
+BABY_CRYING_DETECT=no
 LED=yes
 ROTATE=no
 IR=yes
diff --git a/src/static/static/home/yi-hack-v5/script/check_conf.sh b/src/static/static/home/yi-hack-v5/script/check_conf.sh
index 0c9a350..4adf9ea 100755
--- a/src/static/static/home/yi-hack-v5/script/check_conf.sh
+++ b/src/static/static/home/yi-hack-v5/script/check_conf.sh
@@ -48,19 +48,13 @@ DEBUG_LOG=no"
 PARMS2="
 SWITCH_ON=yes
 SAVE_VIDEO_ON_MOTION=yes
-MOTION_DETECTION=yes
 SENSITIVITY=low
-AI_HUMAN_DETECTION=no
-AI_VEHICLE_DETECTION=no
-AI_ANIMAL_DETECTION=no
-FACE_DETECTION=no
-MOTION_TRACKING=no
 SOUND_DETECTION=no
 SOUND_SENSITIVITY=80
+BABY_CRYING_DETECT=no
 LED=yes
 ROTATE=no
-IR=yes
-CRUISE=no"
+IR=yes"
 
 PARMS3="
 MQTT_IP=0.0.0.0

From a309b2aac774f2cb39f34969d7721f9c6df2a02a Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Sat, 26 Aug 2023 15:23:04 +0200
Subject: [PATCH 16/81] Remove ai_human_detection and restore baby_crying

---
 src/www/httpd/cgi-bin/camera_settings.sh        | 12 ++++++------
 .../httpd/htdocs/js/modules/camera_settings.js  |  2 +-
 src/www/httpd/htdocs/pages/camera_settings.html | 17 +++++++++++++++--
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/www/httpd/cgi-bin/camera_settings.sh b/src/www/httpd/cgi-bin/camera_settings.sh
index be506fe..ad2888c 100755
--- a/src/www/httpd/cgi-bin/camera_settings.sh
+++ b/src/www/httpd/cgi-bin/camera_settings.sh
@@ -31,12 +31,6 @@ do
         fi
     elif [ "$CONF" == "sensitivity" ] ; then
         ipc_cmd -s $VAL
-    elif [ "$CONF" == "ai_human_detection" ] ; then
-        if [ "$VAL" == "no" ] ; then
-            ipc_cmd -a off
-        else
-            ipc_cmd -a on
-        fi
     elif [ "$CONF" == "sound_detection" ] ; then
         if [ "$VAL" == "no" ] ; then
             ipc_cmd -b off
@@ -47,6 +41,12 @@ do
         if [ "$VAL" == "50" ] || [ "$VAL" == "60" ] || [ "$VAL" == "70" ] || [ "$VAL" == "80" ] || [ "$VAL" == "90" ] ; then
             ipc_cmd -n $VAL
         fi
+    elif [ "$CONF" == "baby_crying_detect" ] ; then
+        if [ "$VAL" == "no" ] ; then
+            ipc_cmd -B off
+        else
+            ipc_cmd -B on
+        fi
     elif [ "$CONF" == "led" ] ; then
         if [ "$VAL" == "no" ] ; then
             ipc_cmd -l off
diff --git a/src/www/httpd/htdocs/js/modules/camera_settings.js b/src/www/httpd/htdocs/js/modules/camera_settings.js
index b7e815e..57cdfd0 100644
--- a/src/www/httpd/htdocs/js/modules/camera_settings.js
+++ b/src/www/httpd/htdocs/js/modules/camera_settings.js
@@ -57,9 +57,9 @@ APP.camera_settings = (function ($) {
             url: 'cgi-bin/camera_settings.sh?' +
                 'save_video_on_motion=' + configs["SAVE_VIDEO_ON_MOTION"] +
                 '&sensitivity=' + configs["SENSITIVITY"] +
-                '&ai_human_detection=' + configs["AI_HUMAN_DETECTION"] +
                 '&sound_detection=' + configs["SOUND_DETECTION"] +
                 '&sound_sensitivity=' + configs["SOUND_SENSITIVITY"] +
+                '&baby_crying_detect=' + configs["BABY_CRYING_DETECT"] +
                 '&led=' + configs["LED"] +
                 '&ir=' + configs["IR"] +
                 '&rotate=' + configs["ROTATE"] +
diff --git a/src/www/httpd/htdocs/pages/camera_settings.html b/src/www/httpd/htdocs/pages/camera_settings.html
index 55bc522..8d94fb8 100644
--- a/src/www/httpd/htdocs/pages/camera_settings.html
+++ b/src/www/httpd/htdocs/pages/camera_settings.html
@@ -76,7 +76,7 @@ <h4 class="no-margin">General</h4>
                                 Enable/disable AI Human Detection.
                             </span>
                         </td>
-                    </tr>
+                    </tr> -->
                     <tr class="row">
                         <td>Sound Detection</td>
                         <td>
@@ -103,7 +103,20 @@ <h4 class="no-margin">General</h4>
                                 </select>
                             </div>
                         </td>
-                    </tr> -->
+                    </tr>
+                    <tr class="row">
+                        <td>Baby crying detect</td>
+                        <td>
+                            <label class="switch small">
+                                <input type="checkbox" data-key="BABY_CRYING_DETECT"/>
+                                <span class="slider round"/>
+                                <span class="switch-text"/>
+                            </label>
+                            <span class="switch-description">
+                                Enable/disable baby crying detect.
+                            </span>
+                        </td>
+                    </tr>
                     <tr class="row">
                         <td>Status led</td>
                         <td>

From 878720fe0f34a2a84197cadf913b484d91c3a3fa Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Sat, 26 Aug 2023 15:08:01 +0100
Subject: [PATCH 17/81] [Pre-Release] 0.4.1a  Changes to be committed: 
 modified:   VERSION

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 1d0ba9e..39bbca7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.0
+0.4.1a

From ee0da9d0eb8afdb560953dca9d7f9ac2631d8f92 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Tue, 5 Sep 2023 17:21:38 +0200
Subject: [PATCH 18/81] Change size of fifo queues

---
 src/h264grabber/h264grabber/h264grabber.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/h264grabber/h264grabber/h264grabber.c b/src/h264grabber/h264grabber/h264grabber.c
index 55c4ec8..57c4443 100644
--- a/src/h264grabber/h264grabber/h264grabber.c
+++ b/src/h264grabber/h264grabber/h264grabber.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 roleo.
+ * Copyright (c) 2023 roleo.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -140,6 +140,10 @@
 #define FIFO_NAME_HIGH "/tmp/h264_high_fifo"
 #define FIFO_NAME_AAC  "/tmp/aac_audio_fifo"
 
+#define F_LINUX_SPECIFIC_BASE	1024
+#define F_SETPIPE_SZ	(F_LINUX_SPECIFIC_BASE + 7)
+#define F_GETPIPE_SZ	(F_LINUX_SPECIFIC_BASE + 8)
+
 // Unused vars
 unsigned char IDR[]               = {0x65, 0xB8};
 unsigned char NAL_START[]         = {0x00, 0x00, 0x00, 0x01};
@@ -530,6 +534,10 @@ int main(int argc, char **argv) {
                 fprintf(stderr, "Error opening fifo %s\n", FIFO_NAME_LOW);
                 return -1;
             }
+            if (fcntl(fileno(fOut), F_SETPIPE_SZ, 65536) != 65536) {
+                fprintf(stderr, "Cannot set size of fifo\n");
+                return -1;
+            };
         } else if (resolution == RESOLUTION_HIGH) {
             unlink(FIFO_NAME_HIGH);
             if (mkfifo(FIFO_NAME_HIGH, mode) < 0) {
@@ -546,6 +554,10 @@ int main(int argc, char **argv) {
                 fprintf(stderr, "Error opening fifo %s\n", FIFO_NAME_HIGH);
                 return -1;
             }
+            if (fcntl(fileno(fOut), F_SETPIPE_SZ, 262144) != 262144) {
+                fprintf(stderr, "Cannot set size of fifo\n");
+                return -1;
+            };
         } else if (resolution == RESOLUTION_AUDIO) {
             unlink(FIFO_NAME_AAC);
             if (mkfifo(FIFO_NAME_AAC, mode) < 0) {
@@ -562,6 +574,10 @@ int main(int argc, char **argv) {
                 fprintf(stderr, "Error opening fifo %s\n", FIFO_NAME_AAC);
                 return -1;
             }
+            if (fcntl(fileno(fOut), F_SETPIPE_SZ, 8192) != 8192) {
+                fprintf(stderr, "Cannot set size of fifo\n");
+                return -1;
+            };
         }
     }
 

From 66030f5abbbd86f186907809cb51c0a3a0af898f Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Tue, 5 Sep 2023 17:22:10 +0200
Subject: [PATCH 19/81] Restore audio stream ch0_2.h264

---
 src/rRTSPServer/src/rRTSPServer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rRTSPServer/src/rRTSPServer.cpp b/src/rRTSPServer/src/rRTSPServer.cpp
index fa16d88..9713e03 100755
--- a/src/rRTSPServer/src/rRTSPServer.cpp
+++ b/src/rRTSPServer/src/rRTSPServer.cpp
@@ -362,7 +362,7 @@ int main(int argc, char** argv)
 
         announceStream(rtspServer, sms_low, streamName, inputFileName, audio);
     }
-/*
+
     // An ADTS  audio elementary stream:
     if (audio != 0)
     {
@@ -379,7 +379,7 @@ int main(int argc, char** argv)
 
         announceStream(rtspServer, sms_audio, streamName, inputAudioFileName, audio);
     }
-*/
+
     // Also, attempt to create a HTTP server for RTSP-over-HTTP tunneling.
     // Try first with the default HTTP port (80), and then with the alternative HTTP
     // port numbers (8000 and 8080).

From cf13502b466fd084cfa7d442ca128056ab7540e8 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Tue, 5 Sep 2023 17:23:13 +0200
Subject: [PATCH 20/81] Add native api to take low res snapshot

---
 src/snapshot/snapshot/Makefile     |   7 +-
 src/snapshot/snapshot/cap_pic.c    | 126 +++++++++++++++++++++++++
 src/snapshot/snapshot/cap_pic.h    | 146 +++++++++++++++++++++++++++++
 src/snapshot/snapshot/imggrabber.c |  34 ++++++-
 4 files changed, 310 insertions(+), 3 deletions(-)
 create mode 100644 src/snapshot/snapshot/cap_pic.c
 create mode 100644 src/snapshot/snapshot/cap_pic.h

diff --git a/src/snapshot/snapshot/Makefile b/src/snapshot/snapshot/Makefile
index 2a54974..42d26dc 100644
--- a/src/snapshot/snapshot/Makefile
+++ b/src/snapshot/snapshot/Makefile
@@ -1,8 +1,8 @@
-OBJECTS = imggrabber.o convert2jpg.o add_water.o water_mark.o
+OBJECTS = imggrabber.o convert2jpg.o add_water.o water_mark.o cap_pic.o
 FFMPEG = ffmpeg-6.0
 FFMPEG_DIR = ./$(FFMPEG)
 INC_FF = -I$(FFMPEG_DIR)
-LIB_FF = $(FFMPEG_DIR)/libavcodec/libavcodec.a $(FFMPEG_DIR)/libavutil/libavutil.a -lpthread -lm
+LIB_FF = $(FFMPEG_DIR)/libavcodec/libavcodec.a $(FFMPEG_DIR)/libavutil/libavutil.a -lpthread -lm -lrt
 JPEGLIB = jpeg-9e
 JPEGLIB_DIR = ./$(JPEGLIB)
 JPEGSRC = jpegsrc.v9e
@@ -28,6 +28,9 @@ add_water.o: add_water.c $(HEADERS)
 water_mark.o: water_mark.c $(HEADERS)
 	$(CC) -c $< $(INC_J) -fPIC -O2 -o $@
 
+cap_pic.o: cap_pic.c $(HEADERS)
+	$(CC) -c $< $(INC_J) -fPIC -O2 -o $@
+
 imggrabber: $(OBJECTS)
 	$(CC) $(OBJECTS) $(LIB_J) $(LIB_FF) -fPIC -O2 -o $@
 	$(STRIP) $@
diff --git a/src/snapshot/snapshot/cap_pic.c b/src/snapshot/snapshot/cap_pic.c
new file mode 100644
index 0000000..7b19baf
--- /dev/null
+++ b/src/snapshot/snapshot/cap_pic.c
@@ -0,0 +1,126 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdarg.h>
+
+#include "cap_pic.h"
+
+mqd_t ipc_mq;
+
+void dump_string(char *source_file, const char *func, int line, char *text, ...)
+{
+    time_t now;
+    struct tm *s_now;
+    struct timeval tv;
+
+    if (text == '\0') {
+        return;
+    }
+
+    time(&now);
+    s_now = localtime(&now);
+    if (s_now != 0) {
+        gettimeofday((struct timeval *) &tv, NULL);
+        printf("\n%s(%s-%d)[%02d:%02d:%02d.%03d]:", source_file, func, line, s_now->tm_hour,
+                s_now->tm_min, s_now->tm_sec, tv.tv_usec >> 10);
+        va_list args;
+        va_start (args, text);
+        vfprintf(stdout, text, args);
+        va_end (args);
+        putchar(10);
+    }
+    return;
+}
+
+int mqueue_send(mqd_t mqfd,char *send_buf, size_t send_len)
+{
+    int iRet;
+
+    if (send_len > 512 || mqfd == -1) {
+        return -1;
+    }
+    iRet = mq_send(mqfd, send_buf, send_len, 1);
+
+    return iRet;
+}
+
+int cloud_send_msg(mqd_t mqfd, MSG_TYPE msg_type, char *payload, int payload_len)
+{
+    cloud_send_msg_ex(mqfd, msg_type, 1, payload, payload_len);
+}
+
+int cloud_send_msg_ex(mqd_t mqfd, MSG_TYPE msg_type, short sub, char *payload, int payload_len)
+{
+    mqueue_msg_header_t MsgHead;
+    char send_buf[1024] = {0};
+    int send_len = 0;
+    int fsMsgRet = 0;
+
+    memset(&MsgHead, 0, sizeof(MsgHead));
+    MsgHead.srcMid = MID_CLOUD;
+    MsgHead.mainOp = msg_type;
+    MsgHead.subOp = sub;
+    MsgHead.msgLength = payload_len;
+
+    switch(msg_type)
+    {
+    case RCD_START_SHORT_VIDEO:
+    case RCD_START_SHORT_VIDEO_10S:
+    case RCD_START_VOICECMD_VIDEO:
+        MsgHead.dstMid = MID_RCD;
+        break;
+    case RMM_START_CAPTURE:
+    case RMM_SPEAK_BAN_DEVICE:
+    case RMM_START_PANORAMA_CAPTURE:
+    case RMM_ABORT_PANORAMA_CAPTURE:
+        MsgHead.dstMid = MID_RMM;
+        break;
+    case CLOUD_DEBUG_ALARM:
+        MsgHead.dstMid = MID_CLOUD;
+        break;
+    default:
+        MsgHead.dstMid = MID_DISPATCH;
+        break;
+    }
+
+    memcpy(send_buf, &MsgHead, sizeof(MsgHead));
+    if(NULL!=payload && payload_len>0)
+    {
+        memcpy(send_buf + sizeof(MsgHead), payload, payload_len);
+    }
+    send_len = sizeof(MsgHead) + payload_len;
+
+    fsMsgRet = mqueue_send(mqfd, send_buf, send_len);
+
+    return fsMsgRet;
+}
+
+int cloud_cap_pic(char *pic_name)
+{
+    if(cloud_send_msg(ipc_mq, RMM_START_CAPTURE, pic_name, strlen(pic_name)) < 0)
+    {
+        dump_string(_F_, _FU_, _L_,  "cloud_cap_pic send_msg fail!\n");
+        return -1;
+    }
+    else
+    {
+        dump_string(_F_, _FU_, _L_,  "cloud_cap_pic send_msg ok!\n");
+        return 0;
+    }
+}
+
+int main_cloud_cap_pic(char *nameBuff)
+{
+    ipc_mq = mq_open("/ipc_dispatch", O_RDWR);
+    if (ipc_mq == -1) {
+        dump_string(_F_, _FU_, _L_, "open queue fail!\n");
+        return -1;
+    }
+
+    cloud_cap_pic(nameBuff);
+
+    mq_close(ipc_mq);
+
+    return 0;
+}
diff --git a/src/snapshot/snapshot/cap_pic.h b/src/snapshot/snapshot/cap_pic.h
new file mode 100644
index 0000000..addfa56
--- /dev/null
+++ b/src/snapshot/snapshot/cap_pic.h
@@ -0,0 +1,146 @@
+#ifndef CMD_SRV_H
+#define CMD_SRV_H
+
+#include <stdlib.h>
+#include <mqueue.h>
+
+#define _F_	__FILE__
+#define _FU_	__FUNCTION__
+#define _L_	__LINE__
+
+#define IPC_QUEUE_NAME "/ipc_dispatch"
+
+#define MID_P2P 1
+#define MID_RMM 2
+#define MID_CLOUD 4
+#define MID_DISPATCH 4
+#define MID_RCD 0x10
+
+typedef enum {
+    DISPATCH_SET_TIME = 0x71,
+    DISPATCH_SET_BIND_FAIL = 0x73,
+    DISPATCH_SET_POWER_ON = 0x74,
+    DISPATCH_SET_POWER_OFF = 0x75,
+    DISPATCH_SET_LIGHT_ON = 0x76,
+    DISPATCH_SET_LIGHT_OFF = 0x77,
+    DISPATCH_SET_MOTION_RCD = 0x78,
+    DISPATCH_SET_ALWAYS_RCD = 0x79,
+    DISPATCH_SET_MIRROR_ON = 0x7a,
+    DISPATCH_SET_MIRROR_OFF = 0x7b,
+    DISPATCH_MOTION_DETECT_START = 0x7c,
+    DISPATCH_MOTION_DETECT_STOP = 0x7d,
+    DISPATCH_SET_TNP_INIT_STATUS = 0x7f,
+    DISPATCH_SET_TNP_WORK_MODE = 0x80,
+    DISPATCH_SET_SD_FORMAT = 0x85,
+    DISPATCH_SET_DEBUG_MODE = 0x86,
+    DISPATCH_SET_VIDEO_BACKUP_STATE = 0x87,
+    DISPATCH_SET_BAN_DEVICE = 0x88,
+    DISPATCH_SYNC_INFO_FROM_SERVER = 0x89,
+    DISPATCH_FINISH_SYNC_INFO_FROM_SERVER = 0x8a,
+    DISPATCH_SET_CLOUD_STORAGE_ON = 0x8b,
+    DISPATCH_SET_CLOUD_STORAGE_OFF = 0x8c,
+    DISPATCH_SET_REGION = 0x8d,
+    DISPATCH_SET_TZ_OFFSET = 0x8e,
+    DISPATCH_SET_PWD_USED_CNT = 0x8f,
+    DISPATCH_SET_PWD_SYNC_SERVER = 0x90,
+    DISPATCH_SET_OTA_STATE = 0x91,
+    DISPATCH_SET_PANORAMA_CAPTURE_STATE = 0x92,
+    DISPATCH_SET_PANORAMA_CAPTURE_COUNT = 0x93,
+    DISPATCH_SET_CLOUD_STORAGE_MODE_MOTION_DETECT = 0x94,
+    DISPATCH_SET_CLOUD_STORAGE_MODE_ALL_DAY = 0x95,
+    DISPATCH_SAVE_API_SERVER = 0x96,
+    DISPATCH_CLEAR_API_SERVER = 0x97,
+    DISPATCH_SET_BIND_TIMEOUT = 0x98,
+    DISPATCH_SPEAK_WRONG_DEVICE = 0x99,
+    DISPATCH_SET_LAPSE_VIDEO = 0x9a,
+    DISPATCH_SET_LAPSE_VIDEO_MODIFY = 0x9b,
+    DISPATCH_P2P_CONNECTTED = 0xe1,
+    DISPATCH_P2P_DISCONNECTTED = 0xe2,
+    DISPATCH_P2P_VIEWING = 0xe3,
+    DISPATCH_P2P_STOP_VIEWING = 0xe4,
+    DISPATCH_P2P_CLR_VIEWING = 0xe5,
+    DISPATCH_MOTION_TRACKING_DETECT_START = 0xe6,
+    DISPATCH_BABYCRY_OCCUR = 0xea,
+    DISPATCH_BABYCRY_CLEAR = 0xeb,
+    DISPATCH_SET_SCHEDULE_POWER = 0xec,
+    DISPATCH_HUMAN_DETECT_START = 0xed,
+    DISPATCH_ABNORMAL_SOUND_OCCUR = 0xee,
+    DISPATCH_ABNORMAL_SOUND_CLEAR = 0xef,
+    DISPATCH_CLOUD_PIC_INDEX_OCCUR = 0xf0,
+    DISPATCH_CLOUD_PIC_INDEX_CLEAR = 0xf1,
+    DISPATCH_CLOUD_PIC_SET_INTERVAL = 0xf2,
+    DISPATCH_SET_CLOUD_IMAGE_ON = 0xf3,
+    DISPATCH_SET_CLOUD_IMAGE_OFF = 0xf4,
+    DISPATCH_START_RECORDE = 0Xf5,
+    DISPATCH_STOP_RECORDE = 0Xf6,
+    DISPATCH_FACE_DETECT_START = 0xf7,
+    RMM_SPEAK_SUCCESS = 0x1000,
+    RMM_SPEAK_RESET = 0x1001,
+    RMM_SPEAK_WAIT = 0x1002,
+    RMM_SPEAK_PWD_WRONG = 0x1003,
+    RMM_SPEAK_CONNECTTING = 0x1004,
+    RMM_SPEAK_SCAN_OK = 0x1005,
+    RMM_SPEAK_WIFI_CONNECTTED = 0x1006,
+    RMM_START_CAPTURE = 0x1007,
+    RMM_START_WELCOME = 0x1008,
+    RMM_SPEAK_BINDFAIL = 0x1009,
+    RMM_SPEAK_DOWNLOADING = 0x100a,
+    RMM_SPEAK_UPDATING = 0x100b,
+    RMM_SPEAK_DOWNLOAD_FAIL = 0x100c,
+    RMM_SPEAK_BAN_DEVICE = 0x100d,
+    RMM_APP_MODE_EARPHONE = 0x1021,
+    RMM_APP_MODE_SPKER = 0x1022,
+    RMM_SET_MOTION_DETECT = 0x1023,
+    RMM_SET_DAY_NIGHT_MODE = 0x1024,
+    RMM_SET_MOTION_SENSITIVITY = 0x1027,
+    RMM_SET_LDC = 0x1028,
+    RMM_SET_BABY_CRY = 0x1029,
+    RMM_SET_MIC_VOLUME = 0x102a,
+    RMM_START_PANORAMA_CAPTURE = 0x102b,
+    RMM_ABORT_PANORAMA_CAPTURE = 0x102c,
+    RMM_SPEAK_WRONG_DEVICE = 0x1031,
+    RMM_SET_ENCODE_MODE = 0x1032,
+    RMM_SET_HIGH_RESOLUTION = 0x1033,
+    RNN_VC_START_RECORD = 0x1034,
+    RMM_VC_STOP_RECORD = 0x1035,
+    RMM_SET_LAPSE_FRAMERATE = 0x1036,
+    RMM_SET_LAPSE_FORCE_IDR = 0x1037,
+    RMM_APP_AUDIO_MODE_SIMPLEX = 0x1038,
+    RMM_APP_AUDIO_MODE_DUPLEX = 0x1039,
+    RMM_SET_ABNORMAL_SOUND = 0x103a,
+    RMM_SET_ABNORMAL_SOUND_SENSITIVITY = 0x103b,
+    RMM_SET_HUMAN_MOTION = 0x103c,
+    RMM_SET_FACE_MOTION = 0x103d,
+    RCD_START_SHORT_VIDEO = 0x2000,
+    RCD_START_SHORT_VIDEO_10S = 0x2001,
+    RCD_START_VOICECMD_VIDEO = 0x2002,
+    RCD_START_SHORT_FACE_VIDEO = 0x2003,
+    RCD_START_SHORT_HUMAN_VIDEO = 0x2004,
+    DISPATCH_SET_VIEWPOINT_TRACE = 0x3002,
+    DISPATCH_SET_VOICE_CTRL = 0x3003,
+    DISPATCH_P2P_PTZ_PRESET_ADD = 0x4000,
+    DISPATCH_P2P_PTZ_PRESET_DEL = 0x4001,
+    DISPATCH_P2P_PTZ_SET_CRUISE_STAY_TIME = 0x4003,
+    DISPATCH_P2P_PTZ_CRUISE_START = 0x4004,
+    DISPATCH_P2P_PTZ_CRUISE_STOP = 0x4005,
+    DISPATCH_P2P_PTZ_SET_CURISE_PERIOD = 0x400a,
+    DISPATCH_P2P_PTZ_SET_MOTION_TRACK = 0x400b,
+    BABYCRY_START_MSG = 0x6002,
+    ABNORMAL_SOUND_START_MSG = 0x6004,
+    CLOUD_DEBUG_ALARM = 0x6006
+} MSG_TYPE;
+
+typedef struct
+{
+    int dstMid;
+    int srcMid;
+    short mainOp;
+    short subOp;
+    int msgLength;
+} mqueue_msg_header_t;
+
+void dump_string(char *source_file, const char *func, int line, char *text, ...);
+int cloud_send_msg(mqd_t mqfd, MSG_TYPE msg_type, char *payload, int payload_len);
+int cloud_send_msg_ex(mqd_t mqfd, MSG_TYPE msg_type, short sub, char *payload, int payload_len);
+
+#endif
diff --git a/src/snapshot/snapshot/imggrabber.c b/src/snapshot/snapshot/imggrabber.c
index 9f8f380..ad9b844 100644
--- a/src/snapshot/snapshot/imggrabber.c
+++ b/src/snapshot/snapshot/imggrabber.c
@@ -166,6 +166,8 @@
 
 #define BUFFER_FILE "/tmp/view"
 
+#define USE_NATIVE_API 1
+
 typedef struct {
     int sps_addr;
     int sps_len;
@@ -666,8 +668,9 @@ int main(int argc, char **argv) {
 
     // Check if snapshot is low res
     if (access("/tmp/snapshot.low", F_OK ) == 0 ) {
-        fprintf(stderr, "Snapshot is low res\n");
+        fprintf(stderr, "Snapshot is low res and watermark is disabled\n");
         resolution = RESOLUTION_LOW;
+        watermark = 0;
     }
 
     // Check if the process is already running
@@ -677,6 +680,35 @@ int main(int argc, char **argv) {
         return 0;
     }
 
+// This method doesn't have performace issue
+// But:
+//   - is not available for high resolution
+//   - it's not possible to add watermarks
+#ifdef USE_NATIVE_API
+    if ((resolution == RESOLUTION_LOW) && (watermark == 0)) {
+        int old_stdout = dup(1);
+        int nj;
+        char sj[1024];
+        FILE *aj;
+
+        fprintf(stderr, "Using native api\n");
+
+        freopen ("/dev/null", "w", stdout);
+        main_cloud_cap_pic("/tmp/sd/snapshot.tmp");
+        usleep(500000);
+        fclose(stdout);
+        stdout = fdopen(old_stdout, "w"); 
+
+        aj = fopen("/tmp/sd/snapshot.tmp", "r");
+        while ((nj = fread(sj, 1, sizeof(sj), aj))) {
+            fwrite(sj, 1, nj, stdout);
+        }
+        fclose(aj);
+        remove("/tmp/sd/snapshot.tmp");
+        return 0;
+    }
+#endif
+
     if (resolution == RESOLUTION_LOW) {
         table_offset = table_low_offset;
         stream_offset = stream_low_offset;

From 15e07ff6e9e2d5d39af4fb8da58cb7c325cf32cb Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Tue, 5 Sep 2023 17:24:36 +0200
Subject: [PATCH 21/81] Remove option: watermark for onvif snapshot

---
 src/static/static/home/yi-hack-v5/etc/system.conf   |  1 -
 .../static/home/yi-hack-v5/script/check_conf.sh     |  1 -
 src/static/static/home/yi-hack-v5/script/system.sh  | 12 ++++--------
 src/www/httpd/htdocs/pages/configurations.html      | 13 -------------
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/static/static/home/yi-hack-v5/etc/system.conf b/src/static/static/home/yi-hack-v5/etc/system.conf
index 562bf1f..3e8ef99 100644
--- a/src/static/static/home/yi-hack-v5/etc/system.conf
+++ b/src/static/static/home/yi-hack-v5/etc/system.conf
@@ -13,7 +13,6 @@ ONVIF=no
 ONVIF_WSDD=no
 ONVIF_PROFILE=high
 ONVIF_NETIF=wlan0
-ONVIF_WM_SNAPSHOT=no
 SNAPSHOT=yes
 SNAPSHOT_LOW=no
 NTPD=no
diff --git a/src/static/static/home/yi-hack-v5/script/check_conf.sh b/src/static/static/home/yi-hack-v5/script/check_conf.sh
index 4adf9ea..4120d12 100755
--- a/src/static/static/home/yi-hack-v5/script/check_conf.sh
+++ b/src/static/static/home/yi-hack-v5/script/check_conf.sh
@@ -20,7 +20,6 @@ ONVIF=no
 ONVIF_WSDD=yes
 ONVIF_PROFILE=high
 ONVIF_NETIF=wlan0
-ONVIF_WM_SNAPSHOT=yes
 SNAPSHOT=yes
 SNAPSHOT_LOW=no
 NTPD=yes
diff --git a/src/static/static/home/yi-hack-v5/script/system.sh b/src/static/static/home/yi-hack-v5/script/system.sh
index d934ab2..02861d0 100755
--- a/src/static/static/home/yi-hack-v5/script/system.sh
+++ b/src/static/static/home/yi-hack-v5/script/system.sh
@@ -245,10 +245,6 @@ if [[ $ONVIF_PORT != "80" ]] ; then
     D_ONVIF_PORT=:$ONVIF_PORT
 fi
 
-if [[ $(get_config ONVIF_WM_SNAPSHOT) == "yes" ]] ; then
-    WATERMARK="&watermark=yes"
-fi
-
 if [[ $(get_config SNAPSHOT) == "no" ]] ; then
     touch /tmp/snapshot.disabled
 fi
@@ -281,20 +277,20 @@ if [[ $(get_config RTSP) == "yes" ]] ; then
     fi
     if [[ $(get_config RTSP_STREAM) == "low" ]]; then
         h264grabber -r low -m $MODEL_SUFFIX -f &
-        ONVIF_PROFILE_1="--name Profile_1 --width 640 --height 360 --url rtsp://%s$D_RTSP_PORT/ch0_1.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=low$WATERMARK --type H264"
+        ONVIF_PROFILE_1="--name Profile_1 --width 640 --height 360 --url rtsp://%s$D_RTSP_PORT/ch0_1.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=low&watermark=yes --type H264"
     fi
     if [[ $(get_config RTSP_STREAM) == "high" ]]; then
         h264grabber -r high -m $MODEL_SUFFIX -f &
-        ONVIF_PROFILE_0="--name Profile_0 --width $HIGHWIDTH --height $HIGHHEIGHT --url rtsp://%s$D_RTSP_PORT/ch0_0.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=high$WATERMARK --type H264"
+        ONVIF_PROFILE_0="--name Profile_0 --width $HIGHWIDTH --height $HIGHHEIGHT --url rtsp://%s$D_RTSP_PORT/ch0_0.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=high&watermark=yes --type H264"
     fi
     if [[ $(get_config RTSP_STREAM) == "both" ]]; then
          h264grabber -r low -m $MODEL_SUFFIX -f &
          h264grabber -r high -m $MODEL_SUFFIX -f &
         if [[ $(get_config ONVIF_PROFILE) == "low" ]] || [[ $(get_config ONVIF_PROFILE) == "both" ]] ; then
-            ONVIF_PROFILE_1="--name Profile_1 --width 640 --height 360 --url rtsp://%s$D_RTSP_PORT/ch0_1.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=low$WATERMARK --type H264"
+            ONVIF_PROFILE_1="--name Profile_1 --width 640 --height 360 --url rtsp://%s$D_RTSP_PORT/ch0_1.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=low&watermark=yes --type H264"
         fi
         if [[ $(get_config ONVIF_PROFILE) == "high" ]] || [[ $(get_config ONVIF_PROFILE) == "both" ]] ; then
-            ONVIF_PROFILE_0="--name Profile_0 --width $HIGHWIDTH --height $HIGHHEIGHT --url rtsp://%s$D_RTSP_PORT/ch0_0.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=high$WATERMARK --type H264"
+            ONVIF_PROFILE_0="--name Profile_0 --width $HIGHWIDTH --height $HIGHHEIGHT --url rtsp://%s$D_RTSP_PORT/ch0_0.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=high&watermark=yes --type H264"
         fi
     rRTSPServer -r $RRTSP_RES -a $RRTSP_AUDIO -p $RRTSP_PORT -u $RRTSP_USER -w $RRTSP_PWD &
     fi
diff --git a/src/www/httpd/htdocs/pages/configurations.html b/src/www/httpd/htdocs/pages/configurations.html
index 989e240..5a53b93 100644
--- a/src/www/httpd/htdocs/pages/configurations.html
+++ b/src/www/httpd/htdocs/pages/configurations.html
@@ -159,19 +159,6 @@ <h4 class="no-margin">General</h4>
                             </div>
                         </td>
                     </tr>
-                    <tr class="row">
-                        <td>ONVIF watermark</td>
-                        <td>
-                            <label class="switch small">
-                                <input type="checkbox" data-key="ONVIF_WM_SNAPSHOT"/>
-                                <span class="slider round"></span>
-                                <span class="switch-text"></span>
-                            </label>
-                            <span class="switch-description">
-                                Add watermark to snapshot.
-                            </span>
-                        </td>
-                    </tr>
                     <tr class="row">
                         <td>Snapshot</td>
                         <td>

From c821423f61da34d030435b4081c5290e9221b5f4 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Tue, 5 Sep 2023 17:25:02 +0200
Subject: [PATCH 22/81] Change label for "Force low res snapshot"

---
 src/www/httpd/htdocs/pages/configurations.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/www/httpd/htdocs/pages/configurations.html b/src/www/httpd/htdocs/pages/configurations.html
index 5a53b93..2819fac 100644
--- a/src/www/httpd/htdocs/pages/configurations.html
+++ b/src/www/httpd/htdocs/pages/configurations.html
@@ -183,7 +183,7 @@ <h4 class="no-margin">General</h4>
                                 <span class="switch-text"></span>
                             </label>
                             <span class="switch-description">
-                                Take low resolution snapshots only (useful for avoiding memory problems).
+                                Take low resolution snapshots only and no watermark (useful for avoiding memory problems).
                             </span>
                         </td>
                     </tr>

From 63213ca4b62245b752d05ecb25d957f983c986f0 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Sat, 16 Sep 2023 23:01:20 +0100
Subject: [PATCH 23/81] [Change] launch.sh optimised to kill gently  Changes to
 be committed: 	modified:   src/static/static/home/yi-hack-v5/script/launch.sh

---
 .../static/home/yi-hack-v5/script/launch.sh   | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/static/static/home/yi-hack-v5/script/launch.sh b/src/static/static/home/yi-hack-v5/script/launch.sh
index c267b0f..193d00c 100755
--- a/src/static/static/home/yi-hack-v5/script/launch.sh
+++ b/src/static/static/home/yi-hack-v5/script/launch.sh
@@ -1,3 +1,6 @@
+#!/bin/sh
+#
+# 0.4.1b
 #
 #  This file is part of yi-hack-v5 (https://github.com/alienatedsec/yi-hack-v5).
 #  Copyright (c) 2021-2023 alienatedsec - v5 specific
@@ -14,19 +17,23 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-# Launch - version 0.3.8
-#
-#!/bin/sh
+
 
 kill_all() {
-  # Kills all running instances of app1 and app2
-  killall wd_rtsp.sh
-  killall rRTSPServer
-  killall h264grabber
+  # Kills all running instances
+  killall -s SIGTERM wd_rtsp.sh
+  killall -s SIGTERM rRTSPServer
+  killall -s SIGTERM h264grabber
+  
+  sleep 10
+  
+  killall -s SIGKILL wd_rtsp.sh
+  killall -s SIGKILL rRTSPServer
+  killall -s SIGKILL h264grabber
 }
 
 launch_apps() {
-  # Launches app1 and app2 with different commands
+  # Launches apps with different commands
   if [ "$execute_audio" = true ]; then
     h264grabber -r audio -m "$model" -f &
   fi
@@ -62,7 +69,7 @@ launch_apps() {
 }
 
 
-# Read model name from file
+# Read model and versions from files
 model=$(cat /home/app/.camver)
 version_cam=$(cat /home/yi-hack-v5/version)
 version_sd=$(cat /tmp/sd/yi-hack-v5/version)

From 26009c1e3c4e2fbe635ea7f601a1b7776c7e85c9 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Fri, 22 Sep 2023 14:36:53 +0100
Subject: [PATCH 24/81] [Change] Tuning launch.sh  Changes to be committed: 
 modified:   src/static/static/home/yi-hack-v5/script/launch.sh

---
 .../static/home/yi-hack-v5/script/launch.sh   | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/static/static/home/yi-hack-v5/script/launch.sh b/src/static/static/home/yi-hack-v5/script/launch.sh
index 193d00c..b0def59 100755
--- a/src/static/static/home/yi-hack-v5/script/launch.sh
+++ b/src/static/static/home/yi-hack-v5/script/launch.sh
@@ -21,48 +21,62 @@
 
 kill_all() {
   # Kills all running instances
+  echo Round 1 - Killing using SIGTERM
   killall -s SIGTERM wd_rtsp.sh
   killall -s SIGTERM rRTSPServer
   killall -s SIGTERM h264grabber
-  
-  sleep 10
-  
+  echo Round 1 - Finished
+  sleep 2
+  echo Round 2 - Killing using SIGKILL
   killall -s SIGKILL wd_rtsp.sh
   killall -s SIGKILL rRTSPServer
   killall -s SIGKILL h264grabber
+  echo Round 2 - Finished
 }
 
 launch_apps() {
   # Launches apps with different commands
   if [ "$execute_audio" = true ]; then
+    echo Launching - h264grabber -r audio -m "$model" -f &
     h264grabber -r audio -m "$model" -f &
   fi
   
   if [ "$settings" = "high" ]; then
     debug_flag=""
     if [ "$debug_mode" = true ]; then
-      debug_flag="-d 7"
+      debug_flag="-d "$debug_level""
     fi
+    echo Launching - h264grabber -r high -m "$model" -f &
     h264grabber -r high -m "$model" -f &
+    sleep 1
+    echo Launching - rRTSPServer -r high -a "$enable_audio" -p 554 -u -w $debug_flag &
     rRTSPServer -r high -a "$enable_audio" -p 554 -u -w $debug_flag &
   fi
 
   if [ "$settings" = "low" ]; then
     debug_flag=""
     if [ "$debug_mode" = true ]; then
-      debug_flag="-d 7"
+      debug_flag="-d "$debug_level""
     fi
+    echo Launching - h264grabber -r low -m "$model" -f &
     h264grabber -r low -m "$model" -f &
+    sleep 1
+    echo Launching - rRTSPServer -r low -a "$enable_audio" -p 554 -u -w $debug_flag &
     rRTSPServer -r low -a "$enable_audio" -p 554 -u -w $debug_flag &
   fi
   
   if [ "$settings" = "both" ]; then
     debug_flag=""
     if [ "$debug_mode" = true ]; then
-      debug_flag="-d 7"
+      debug_flag="-d "$debug_level""
     fi
+    echo Launching - h264grabber -r low -m "$model" -f &
     h264grabber -r low -m "$model" -f &
+    sleep 1
+    echo Launching - h264grabber -r high -m "$model" -f &
 	h264grabber -r high -m "$model" -f &
+    sleep 1
+    echo Launching - rRTSPServer -r both -a "$enable_audio" -p 554 -u -w $debug_flag &
     rRTSPServer -r both -a "$enable_audio" -p 554 -u -w $debug_flag &
   fi
 
@@ -97,6 +111,11 @@ elif [ "$operation" = "l" ] || [ "$operation" = "L" ]; then
 
   if [ "$debug_choice" = "y" ] || [ "$debug_choice" = "Y" ]; then
     debug_mode=true
+    read -p "Provide debug level (0-15): " debug_level
+    while ! [ "$debug_level" -ge 0 -a "$debug_level" -le 15 ] 2>/dev/null; do
+      echo "Invalid input. Please enter a debug level between 0 and 15."
+      read -p "Provide debug level (0-15): " debug_level
+    done
   else
     debug_mode=false
   fi

From db856f3dbde9e091cd52cf74411d363c39203347 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Sat, 23 Sep 2023 15:19:37 +0100
Subject: [PATCH 25/81] [New] Compile specific module - thanks
 @thelittlefireman  Changes to be committed: 	modified:   scripts/compile.sh

---
 scripts/compile.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/scripts/compile.sh b/scripts/compile.sh
index 6c7972d..5e6fb2c 100755
--- a/scripts/compile.sh
+++ b/scripts/compile.sh
@@ -39,6 +39,7 @@ compile_module()
     printf "MOD_COMPILE:    %s\n" "$MOD_COMPILE"
     printf "MOD_INSTALL:    %s\n" "$MOD_INSTALL"
     
+    echo "Compile $MOD_NAME"
     cd "$MOD_DIR"
     
     if [ ! -f $MOD_INIT ]; then
@@ -89,10 +90,22 @@ mkdir -p "$(get_script_dir)/../build/home"
 mkdir -p "$(get_script_dir)/../build/rootfs"
 
 SRC_DIR=$(get_script_dir)/../src
+SELECTED_MODULE=$1
+if [ -n ${SELECTED_MODULE} ]; then
+    echo "SELECTED_MODULE: $SELECTED_MODULE"
+fi
 
 for SUB_DIR in $SRC_DIR/* ; do
     if [ -d ${SUB_DIR} ]; then # Will not run if no directories are available
-        compile_module $(normalize_path "$SUB_DIR") || exit 1
+        if [ -n ${SELECTED_MODULE} ]; then
+            if [[ $SUB_DIR == *"$SELECTED_MODULE"* ]]; then
+                compile_module $(normalize_path "$SUB_DIR") || exit 1
+            else
+                echo "Skip $SUB_DIR"
+            fi
+        else
+            compile_module $(normalize_path "$SUB_DIR") || exit 1
+        fi
     fi
 done
 

From 54b1e653d8aa6136537568b3d8a4b8d7b66bb7cb Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Thu, 28 Sep 2023 18:32:12 +0200
Subject: [PATCH 26/81] Improve RTSP server

---
 src/rRTSPServer/Makefile.rRTSPServer          |   4 +-
 .../ADTSAudioFifoServerMediaSubsession.hh     |   0
 .../include/ADTSAudioFifoSource.hh            |   0
 .../include/ByteStreamFifoSource.hh           |   0
 .../H264VideoFifoServerMediaSubsession.hh     |   0
 src/rRTSPServer/include/presentationTime.hh   |   0
 .../ADTSAudioFifoServerMediaSubsession.cpp    |   1 +
 src/rRTSPServer/src/ADTSAudioFifoSource.cpp   | 122 +++++++++---------
 src/rRTSPServer/src/ByteStreamFifoSource.cpp  |   4 +
 .../H264VideoFifoServerMediaSubsession.cpp    |   2 +-
 src/rRTSPServer/src/rRTSPServer.cpp           |   4 +-
 11 files changed, 73 insertions(+), 64 deletions(-)
 mode change 100755 => 100644 src/rRTSPServer/Makefile.rRTSPServer
 mode change 100755 => 100644 src/rRTSPServer/include/ADTSAudioFifoServerMediaSubsession.hh
 mode change 100755 => 100644 src/rRTSPServer/include/ADTSAudioFifoSource.hh
 mode change 100755 => 100644 src/rRTSPServer/include/ByteStreamFifoSource.hh
 mode change 100755 => 100644 src/rRTSPServer/include/H264VideoFifoServerMediaSubsession.hh
 mode change 100755 => 100644 src/rRTSPServer/include/presentationTime.hh

diff --git a/src/rRTSPServer/Makefile.rRTSPServer b/src/rRTSPServer/Makefile.rRTSPServer
old mode 100755
new mode 100644
index 9cecfac..7fab00a
--- a/src/rRTSPServer/Makefile.rRTSPServer
+++ b/src/rRTSPServer/Makefile.rRTSPServer
@@ -1,5 +1,5 @@
 ##### Change the following for your environment:
-COMPILE_OPTS =		$(INCLUDES) -I. -I./include -O2 -ffunction-sections -fdata-sections -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DNO_OPENSSL=1 -DRTP_PAYLOAD_MAX_SIZE=1352 -DNEWLOCALE_NOT_USED
+COMPILE_OPTS =		$(INCLUDES) -I. -I./include -O1 -ffunction-sections -fdata-sections -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DNO_OPENSSL=1 -DRTP_PAYLOAD_MAX_SIZE=1352 -DNEWLOCALE_NOT_USED
 C =			c
 C_COMPILER =		$(CC)
 C_FLAGS =		$(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS)
@@ -73,7 +73,7 @@ livemedia:
 
 rRTSPServer_OBJS	= src/rRTSPServer.$(OBJ) \
 				src/ADTSAudioFifoServerMediaSubsession.$(OBJ) src/ADTSAudioFifoSource.$(OBJ) \
-				src/DummySink.$(OBJ) src/ByteStreamFifoSource.$(OBJ) src/H264VideoFifoServerMediaSubsession.$(OBJ) \
+				src/ByteStreamFifoSource.$(OBJ) src/H264VideoFifoServerMediaSubsession.$(OBJ) \
 
 rRTSPServer$(EXE):	$(rRTSPServer_OBJS) $(LOCAL_LIBS)
 	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(rRTSPServer_OBJS) $(LIBS) -lpthread
diff --git a/src/rRTSPServer/include/ADTSAudioFifoServerMediaSubsession.hh b/src/rRTSPServer/include/ADTSAudioFifoServerMediaSubsession.hh
old mode 100755
new mode 100644
diff --git a/src/rRTSPServer/include/ADTSAudioFifoSource.hh b/src/rRTSPServer/include/ADTSAudioFifoSource.hh
old mode 100755
new mode 100644
diff --git a/src/rRTSPServer/include/ByteStreamFifoSource.hh b/src/rRTSPServer/include/ByteStreamFifoSource.hh
old mode 100755
new mode 100644
diff --git a/src/rRTSPServer/include/H264VideoFifoServerMediaSubsession.hh b/src/rRTSPServer/include/H264VideoFifoServerMediaSubsession.hh
old mode 100755
new mode 100644
diff --git a/src/rRTSPServer/include/presentationTime.hh b/src/rRTSPServer/include/presentationTime.hh
old mode 100755
new mode 100644
diff --git a/src/rRTSPServer/src/ADTSAudioFifoServerMediaSubsession.cpp b/src/rRTSPServer/src/ADTSAudioFifoServerMediaSubsession.cpp
index 19475ac..44e29c2 100755
--- a/src/rRTSPServer/src/ADTSAudioFifoServerMediaSubsession.cpp
+++ b/src/rRTSPServer/src/ADTSAudioFifoServerMediaSubsession.cpp
@@ -20,6 +20,7 @@ along with this library; if not, write to the Free Software Foundation, Inc.,
 // Implementation
 
 #include "ADTSAudioFifoServerMediaSubsession.hh"
+#include "ADTSAudioStreamDiscreteFramer.hh"
 #include "ADTSAudioFifoSource.hh"
 #include "MPEG4GenericRTPSink.hh"
 #include "FramedFilter.hh"
diff --git a/src/rRTSPServer/src/ADTSAudioFifoSource.cpp b/src/rRTSPServer/src/ADTSAudioFifoSource.cpp
index d706cd5..52e8262 100755
--- a/src/rRTSPServer/src/ADTSAudioFifoSource.cpp
+++ b/src/rRTSPServer/src/ADTSAudioFifoSource.cpp
@@ -212,90 +212,94 @@ void ADTSAudioFifoSource::doReadFromFile() {
 #else
     if (read(fileno(fFid), headers, sizeof headers) < (signed) sizeof headers) {
 #endif
-        // The input source has ended:
-        handleClosure();
-        return;
-    }
+        fFrameSize = 0;
+        fNumTruncatedBytes = 0;
+//        // The input source has ended:
+//        handleClosure();
+//        return;
+    } else {
 
-    // Extract important fields from the headers:
-    Boolean protection_absent = headers[1]&0x01;
-    u_int16_t frame_length
-        = ((headers[3]&0x03)<<11) | (headers[4]<<3) | ((headers[5]&0xE0)>>5);
-    u_int16_t syncword = (headers[0]<<4) | (headers[1]>>4);
-    if (debug & 4) fprintf(stderr, "Read frame: syncword 0x%x, protection_absent %d, frame_length %d\n", syncword, protection_absent, frame_length);
-    if (syncword != 0xFFF) {
-        fprintf(stderr, "WARNING: Bad syncword! Try to recover sync.\n");
-        // Resync
-        while (1) {
+        // Extract important fields from the headers:
+        Boolean protection_absent = headers[1]&0x01;
+        u_int16_t frame_length
+            = ((headers[3]&0x03)<<11) | (headers[4]<<3) | ((headers[5]&0xE0)>>5);
+        u_int16_t syncword = (headers[0]<<4) | (headers[1]>>4);
+        if (debug & 4) fprintf(stderr, "Read frame: syncword 0x%x, protection_absent %d, frame_length %d\n", syncword, protection_absent, frame_length);
+        if (syncword != 0xFFF) {
+            fprintf(stderr, "WARNING: Bad syncword! Try to recover sync.\n");
+            // Resync
+            while (1) {
 #ifdef READ_FROM_FILES_SYNCHRONOUSLY
-            fread(headers, 1, 1, fFid);
+                fread(headers, 1, 1, fFid);
 #else
-            read(fileno(fFid), headers, 1);
+                read(fileno(fFid), headers, 1);
 #endif
-            if (headers[0] == 0xFF) {
+                if (headers[0] == 0xFF) {
 #ifdef READ_FROM_FILES_SYNCHRONOUSLY
-                fread(&headers[1], 1, 1, fFid);
+                    fread(&headers[1], 1, 1, fFid);
 #else
-                read(fileno(fFid), &headers[1], 1);
+                    read(fileno(fFid), &headers[1], 1);
 #endif
-                // Check the 'syncword':
-                if ((headers[1]&0xF0) == 0xF0) {
+                    // Check the 'syncword':
+                    if ((headers[1]&0xF0) == 0xF0) {
 #ifdef READ_FROM_FILES_SYNCHRONOUSLY
-                    fread(&headers[2], 1, sizeof(headers) - 2, fFid);
+                        fread(&headers[2], 1, sizeof(headers) - 2, fFid);
 #else
-                    read(fileno(fFid), &headers[2], sizeof(headers) - 2);
+                        read(fileno(fFid), &headers[2], sizeof(headers) - 2);
 #endif
-                    break;
+                        break;
+                    }
                 }
+                usleep(1000);
             }
-            usleep(10000);
         }
-    }
-    unsigned numBytesToRead
-        = frame_length > sizeof headers ? frame_length - sizeof headers : 0;
+        unsigned numBytesToRead
+            = frame_length > sizeof headers ? frame_length - sizeof headers : 0;
 
-    // If there's a 'crc_check' field, skip it:
-    if (!protection_absent) {
-        unsigned char null[2];
+        // If there's a 'crc_check' field, skip it:
+        if (!protection_absent) {
+            unsigned char null[2];
 #ifdef READ_FROM_FILES_SYNCHRONOUSLY
-        fread(null, 1, 2, fFid);
+            fread(null, 1, 2, fFid);
 #else
-        read(fileno(fFid), null, 2);
+            read(fileno(fFid), null, 2);
 #endif
-        numBytesToRead = numBytesToRead > 2 ? numBytesToRead - 2 : 0;
-    }
+            numBytesToRead = numBytesToRead > 2 ? numBytesToRead - 2 : 0;
+        }
 
-    // Next, read the raw frame data into the buffer provided:
-    if (numBytesToRead > fMaxSize) {
-        fNumTruncatedBytes = numBytesToRead - fMaxSize;
-        numBytesToRead = fMaxSize;
-    }
+        // Next, read the raw frame data into the buffer provided:
+        if (numBytesToRead > fMaxSize) {
+            fNumTruncatedBytes = numBytesToRead - fMaxSize;
+            numBytesToRead = fMaxSize;
+        }
 #ifdef READ_FROM_FILES_SYNCHRONOUSLY
-    int numBytesRead = fread(fTo, 1, numBytesToRead, fFid);
+        int numBytesRead = fread(fTo, 1, numBytesToRead, fFid);
 #else
-    int numBytesRead = read(fileno(fFid), fTo, numBytesToRead);
+        int numBytesRead = read(fileno(fFid), fTo, numBytesToRead);
 #endif
-    if (numBytesRead < 0) numBytesRead = 0;
-    fFrameSize = numBytesRead;
-    fNumTruncatedBytes += numBytesToRead - numBytesRead;
-
-    // Set the 'presentation time':
-    if (fPresentationTime.tv_sec == 0 && fPresentationTime.tv_usec == 0) {
-        // This is the first frame, so use the current time:
-        gettimeofday(&fPresentationTime, NULL);
-    } else {
+        if (numBytesRead < 0) numBytesRead = 0;
+        fFrameSize = numBytesRead;
+        fNumTruncatedBytes += numBytesToRead - numBytesRead;
+
+        // Set the 'presentation time':
+        if (fPresentationTime.tv_sec == 0 && fPresentationTime.tv_usec == 0) {
+            // This is the first frame, so use the current time:
+            gettimeofday(&fPresentationTime, NULL);
+        } else {
 #ifndef PRES_TIME_CLOCK
-        // Increment by the play time of the previous frame:
-        unsigned uSeconds = fPresentationTime.tv_usec + fuSecsPerFrame;
-        fPresentationTime.tv_sec += uSeconds/1000000;
-        fPresentationTime.tv_usec = uSeconds%1000000;
+            // Increment by the play time of the previous frame:
+            unsigned uSeconds = fPresentationTime.tv_usec + fuSecsPerFrame;
+            fPresentationTime.tv_sec += uSeconds/1000000;
+            fPresentationTime.tv_usec = uSeconds%1000000;
 #else
-        // Use system clock to set presentation time
-        gettimeofday(&fPresentationTime, NULL);
+            // Use system clock to set presentation time
+            gettimeofday(&fPresentationTime, NULL);
 #endif
-    }
+        }
+        if (debug & 4) fprintf(stderr, "AAC frame  - fPresentationTime, sec = %ld, usec = %ld\n", fPresentationTime.tv_sec, fPresentationTime.tv_usec);
 
-    fDurationInMicroseconds = fuSecsPerFrame;
+        fDurationInMicroseconds = fuSecsPerFrame;
+    }
 
     // Switch to another task, and inform the reader that he has data:
 #ifdef READ_FROM_FILES_SYNCHRONOUSLY
diff --git a/src/rRTSPServer/src/ByteStreamFifoSource.cpp b/src/rRTSPServer/src/ByteStreamFifoSource.cpp
index c30ed73..ee4e58d 100755
--- a/src/rRTSPServer/src/ByteStreamFifoSource.cpp
+++ b/src/rRTSPServer/src/ByteStreamFifoSource.cpp
@@ -27,6 +27,8 @@ along with this library; if not, write to the Free Software Foundation, Inc.,
 
 ////////// ByteStreamFifoSource //////////
 
+extern int debug;
+
 ByteStreamFifoSource*
 ByteStreamFifoSource::createNew(UsageEnvironment& env, char const* fileName,
                                 unsigned preferredFrameSize,
@@ -170,7 +172,9 @@ void ByteStreamFifoSource::doReadFromFile() {
         // We don't know a specific play time duration for this data,
         // so just record the current time as being the 'presentation time':
         gettimeofday(&fPresentationTime, NULL);
+        fDurationInMicroseconds = fPlayTimePerFrame;
     }
+    if (debug & 4) fprintf(stderr, "h264 frame - fPresentationTime, sec = %ld, usec = %ld\n", fPresentationTime.tv_sec, fPresentationTime.tv_usec);
 
     // Inform the reader that he has data:
 #ifdef READ_FROM_FILES_SYNCHRONOUSLY
diff --git a/src/rRTSPServer/src/H264VideoFifoServerMediaSubsession.cpp b/src/rRTSPServer/src/H264VideoFifoServerMediaSubsession.cpp
index a25e05e..0ac2044 100755
--- a/src/rRTSPServer/src/H264VideoFifoServerMediaSubsession.cpp
+++ b/src/rRTSPServer/src/H264VideoFifoServerMediaSubsession.cpp
@@ -106,7 +106,7 @@ FramedSource* H264VideoFifoServerMediaSubsession::createNewStreamSource(unsigned
     estBitrate = 500; // kbps, estimate
 
     // Create the video source:
-    ByteStreamFifoSource* fileSource = ByteStreamFifoSource::createNew(envir(), fFileName);
+    ByteStreamFifoSource* fileSource = ByteStreamFifoSource::createNew(envir(), fFileName, 0, 50000);
     if (fileSource == NULL) return NULL;
     fFileSize = fileSource->fileSize();
 
diff --git a/src/rRTSPServer/src/rRTSPServer.cpp b/src/rRTSPServer/src/rRTSPServer.cpp
index 9713e03..4c1f83c 100755
--- a/src/rRTSPServer/src/rRTSPServer.cpp
+++ b/src/rRTSPServer/src/rRTSPServer.cpp
@@ -64,10 +64,10 @@ StreamReplicator* startReplicatorStream(const char* inputAudioFileName) {
     FramedSource* source = replicator->createStreamReplica();
 
     // Then create a 'dummy sink' object to receive the replica stream:
-    MediaSink* sink = DummySink::createNew(*env, "dummy");
+//    MediaSink* sink = DummySink::createNew(*env, "dummy");
 
     // Now, start playing, feeding the sink object from the source:
-    sink->startPlaying(*source, NULL, NULL);
+//    sink->startPlaying(*source, NULL, NULL);
 
     return replicator;
 }

From e6ebbce764ecd559ec5d612619caba1f9197b154 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Thu, 28 Sep 2023 18:32:54 +0200
Subject: [PATCH 27/81] Minor fixes

---
 src/static/static/home/yi-hack-v5/script/cloudAPI_fake | 4 ++--
 src/static/static/home/yi-hack-v5/script/system.sh     | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/static/static/home/yi-hack-v5/script/cloudAPI_fake b/src/static/static/home/yi-hack-v5/script/cloudAPI_fake
index 748167d..5bfc867 100755
--- a/src/static/static/home/yi-hack-v5/script/cloudAPI_fake
+++ b/src/static/static/home/yi-hack-v5/script/cloudAPI_fake
@@ -95,8 +95,8 @@ elif [ "$c" = "142" ]; then
     TZP=$(TZ="$TIMEZONE" date +%z)
     TZP_SET=$(echo ${TZP:1:2} ${TZP:3:2} | awk '{ print ($1*3600+$2*60) }')
     TZP_GMT=$(echo GMT${TZP:0:1}${TZP:1:2}:${TZP:3:2})
-    echo '{"code":"20000","data":{"timezone":"'$TZP_GMT'","language":"en-US","tz_offset":'$TZP_SET'000,"css_flag":0,"css_mode":0,"appParam":"","doorbellCoolingDuration":"0"}}'
-    #echo '{"code":"20000","data":{"timezone":"'$TZP_GMT'","language":"en-US","tz_offset":'$TZP_SET'000,"css_flag":0,"css_mode":0,"appParam":"","doorbellCoolingDuration":"0","allowFeature":{"Vehicle":0,"Animal":0,"Person":1}}}'
+    #echo '{"code":"20000","data":{"timezone":"'$TZP_GMT'","language":"en-US","tz_offset":'$TZP_SET'000,"css_flag":0,"css_mode":0,"appParam":"","doorbellCoolingDuration":"0"}}'
+    echo '{"code":"20000","data":{"timezone":"'$TZP_GMT'","language":"en-US","tz_offset":'$TZP_SET'000,"css_flag":0,"css_mode":0,"appParam":"","doorbellCoolingDuration":"0","allowFeature":{"Vehicle":0,"Animal":0,"Person":1}}}'
     #{"code":"20000","data":{"timezone":"GMT+01:00","language":"en-US","tz_offset":3600000,"css_flag":0,"css_mode":0,"appParam":{"schedule_power":{"schedule_power_on":{"enable":0,"repeater":"","time":"2212220800"},"schedule_power_off":{"enable":0,"repeater":"","time":"2212222200"}}},"doorbellCoolingDuration":"0","model":"38","allowFeature":{"Vehicle":0,"Animal":0,"Person":1}}}
 elif [ "$c" = "304" ]; then
     #CMD_do_update_event_v4
diff --git a/src/static/static/home/yi-hack-v5/script/system.sh b/src/static/static/home/yi-hack-v5/script/system.sh
index 1691a8a..b5d3771 100755
--- a/src/static/static/home/yi-hack-v5/script/system.sh
+++ b/src/static/static/home/yi-hack-v5/script/system.sh
@@ -230,8 +230,6 @@ mkdir -p $YI_HACK_PREFIX/etc/dropbear
     dropbear -R -B
 fi
 
-ipc_multiplexer &
-
 mqttv4 &
 if [[ $(get_config MQTT) == "yes" ]] ; then
     mqtt-config &

From 9c4fff63880b10779c4a4802f22503fb29cd61d6 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Thu, 28 Sep 2023 18:33:45 +0200
Subject: [PATCH 28/81] Remove unused options when empty password

---
 .../static/home/yi-hack-v5/script/system.sh   | 10 ++++++---
 .../static/home/yi-hack-v5/script/wd_rtsp.sh  | 22 +++++++++++--------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/static/static/home/yi-hack-v5/script/system.sh b/src/static/static/home/yi-hack-v5/script/system.sh
index b5d3771..c2455b1 100755
--- a/src/static/static/home/yi-hack-v5/script/system.sh
+++ b/src/static/static/home/yi-hack-v5/script/system.sh
@@ -260,8 +260,12 @@ RRTSP_MODEL=$MODEL_SUFFIX
 RRTSP_RES=$(get_config RTSP_STREAM)
 RRTSP_AUDIO=$(get_config RTSP_AUDIO)
 RRTSP_PORT=$(get_config RTSP_PORT)
-RRTSP_USER=$USERNAME
-RRTSP_PWD=$PASSWORD
+if [ ! -z $USERNAME ]; then
+    RRTSP_USER="-u $USERNAME"
+fi
+if [ ! -z $PASSWORD ]; then
+    RRTSP_PWD="-w $PASSWORD"
+fi
 
 # some non-working functions to be added later
 
@@ -295,7 +299,7 @@ if [[ $(get_config RTSP) == "yes" ]] ; then
         if [[ $(get_config ONVIF_PROFILE) == "high" ]] || [[ $(get_config ONVIF_PROFILE) == "both" ]] ; then
             ONVIF_PROFILE_0="--name Profile_0 --width $HIGHWIDTH --height $HIGHHEIGHT --url rtsp://%s$D_RTSP_PORT/ch0_0.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=high&watermark=yes --type H264"
         fi
-    rRTSPServer -r $RRTSP_RES -a $RRTSP_AUDIO -p $RRTSP_PORT -u $RRTSP_USER -w $RRTSP_PWD &
+    rRTSPServer -r $RRTSP_RES -a $RRTSP_AUDIO -p $RRTSP_PORT $RRTSP_USER $RRTSP_PWD &
     fi
 #Seems to be killing the resource - fixed via #153
     $YI_HACK_PREFIX/script/wd_rtsp.sh &
diff --git a/src/static/static/home/yi-hack-v5/script/wd_rtsp.sh b/src/static/static/home/yi-hack-v5/script/wd_rtsp.sh
index 838cf5b..ed028f5 100755
--- a/src/static/static/home/yi-hack-v5/script/wd_rtsp.sh
+++ b/src/static/static/home/yi-hack-v5/script/wd_rtsp.sh
@@ -27,17 +27,26 @@ COUNTER=0
 COUNTER_LIMIT=10
 INTERVAL=10
 
+if [[ "$(get_config USERNAME)" != "" ]] ; then
+    USERNAME=$(get_config USERNAME)
+    PASSWORD=$(get_config PASSWORD)
+fi
+
 RRTSP_RES=$(get_config RTSP_STREAM)
 RRTSP_AUDIO=$(get_config RTSP_AUDIO)
 RRTSP_MODEL=$MODEL_SUFFIX
 RRTSP_PORT=$(get_config RTSP_PORT)
-RRTSP_USER=$(get_config USERNAME)
-RRTSP_PWD=$(get_config PASSWORD)
+if [ ! -z $USERNAME ]; then
+    RRTSP_USER="-u $USERNAME"
+fi
+if [ ! -z $PASSWORD ]; then
+    RRTSP_PWD="-w $PASSWORD"
+fi
 
 restart_rtsp()
 {
     killall -q rRTSPServer
-    rRTSPServer -r $RRTSP_RES -a $RRTSP_AUDIO -p $RRTSP_PORT -u $RRTSP_USER -w $RRTSP_PWD &
+    rRTSPServer -r $RRTSP_RES -a $RRTSP_AUDIO -p $RRTSP_PORT $RRTSP_USER $RRTSP_PWD &
 }
 
 restart_grabber()
@@ -57,7 +66,7 @@ restart_grabber()
     if [[ $(get_config RTSP_AUDIO) == "yes" ]]; then
         h264grabber -r AUDIO -m $MODEL_SUFFIX -f &
     fi
-    rRTSPServer -r $RRTSP_RES -a $RRTSP_AUDIO -p $RRTSP_PORT -u $RRTSP_USER -w $RRTSP_PWD &
+    rRTSPServer -r $RRTSP_RES -a $RRTSP_AUDIO -p $RRTSP_PORT $RRTSP_USER $RRTSP_PWD &
 }
 
 restart_cloud()
@@ -139,11 +148,6 @@ if [[ $(get_config RTSP) == "no" ]] ; then
     exit
 fi
 
-if [[ "$(get_config USERNAME)" != "" ]] ; then
-    USERNAME=$(get_config USERNAME)
-    PASSWORD=$(get_config PASSWORD)
-fi
-
 # Re-enabled when its starting
 echo "$(date +'%Y-%m-%d %H:%M:%S') - Starting RTSP watchdog..." >> $LOG_FILE
 

From 434db6d2ac1c70da9d7895087fcbf48f7fe562a5 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Thu, 28 Sep 2023 18:34:01 +0200
Subject: [PATCH 29/81] Add mqttv4 to watchdog

---
 .../static/home/yi-hack-v5/script/wd_rtsp.sh   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/static/static/home/yi-hack-v5/script/wd_rtsp.sh b/src/static/static/home/yi-hack-v5/script/wd_rtsp.sh
index ed028f5..df33a4e 100755
--- a/src/static/static/home/yi-hack-v5/script/wd_rtsp.sh
+++ b/src/static/static/home/yi-hack-v5/script/wd_rtsp.sh
@@ -79,6 +79,11 @@ restart_cloud()
     fi
 }
 
+restart_mqttv4()
+{
+    mqttv4 &
+}
+
 check_rtsp()
 {
     SOCKET=`/bin/netstat -an 2>&1 | grep ":$RTSP_PORT " | grep LISTEN | grep -c ^`
@@ -144,6 +149,18 @@ check_grabber()
     fi
 }
 
+check_mqttv4()
+{
+    PS=`ps | grep mqttv4 | grep -v grep | grep -c ^`
+
+    if [ $PS -eq 0 ]; then
+        echo "$(date +'%Y-%m-%d %H:%M:%S') - No running processes, restarting mqttv4 ..." >> $LOG_FILE
+        killall -q mqttv4
+        sleep 1
+        restart_mqttv4
+    fi
+}
+
 if [[ $(get_config RTSP) == "no" ]] ; then
     exit
 fi
@@ -157,6 +174,7 @@ do
     check_rtsp
     check_rmm
     check_cloud
+    check_mqttv4
     if [ $COUNTER -eq 0 ]; then
         sleep $INTERVAL
     fi

From 3cedddd5ab5d40d8ea432a1ae7869b4ed6a3f541 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Thu, 28 Sep 2023 18:34:25 +0200
Subject: [PATCH 30/81] Add "if supported" in camera settings page

---
 src/www/httpd/htdocs/pages/camera_settings.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/www/httpd/htdocs/pages/camera_settings.html b/src/www/httpd/htdocs/pages/camera_settings.html
index 8d94fb8..367f725 100644
--- a/src/www/httpd/htdocs/pages/camera_settings.html
+++ b/src/www/httpd/htdocs/pages/camera_settings.html
@@ -78,7 +78,7 @@ <h4 class="no-margin">General</h4>
                         </td>
                     </tr> -->
                     <tr class="row">
-                        <td>Sound Detection</td>
+                        <td>Sound Detection (if supported by your cam)</td>
                         <td>
                             <label class="switch small">
                                 <input type="checkbox" data-key="SOUND_DETECTION"/>
@@ -105,7 +105,7 @@ <h4 class="no-margin">General</h4>
                         </td>
                     </tr>
                     <tr class="row">
-                        <td>Baby crying detect</td>
+                        <td>Baby crying detect (if supported by your cam)</td>
                         <td>
                             <label class="switch small">
                                 <input type="checkbox" data-key="BABY_CRYING_DETECT"/>

From b305a15a5cf5b99cec55f03058e7d8635c731232 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Fri, 29 Sep 2023 13:45:48 +0200
Subject: [PATCH 31/81] Add support for native time osd

---
 .../static/home/yi-hack-v5/etc/system.conf    |  1 +
 .../home/yi-hack-v5/script/check_conf.sh      |  1 +
 .../static/home/yi-hack-v5/script/system.sh   | 10 ++++++--
 .../httpd/htdocs/js/modules/configurations.js | 24 +++++++++----------
 .../httpd/htdocs/pages/configurations.html    | 17 +++++++++++++
 5 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/static/static/home/yi-hack-v5/etc/system.conf b/src/static/static/home/yi-hack-v5/etc/system.conf
index 51c45b7..d737fee 100644
--- a/src/static/static/home/yi-hack-v5/etc/system.conf
+++ b/src/static/static/home/yi-hack-v5/etc/system.conf
@@ -13,6 +13,7 @@ ONVIF=no
 ONVIF_WSDD=no
 ONVIF_PROFILE=high
 ONVIF_NETIF=wlan0
+TIME_OSD=no
 SNAPSHOT=yes
 SNAPSHOT_LOW=no
 NTPD=no
diff --git a/src/static/static/home/yi-hack-v5/script/check_conf.sh b/src/static/static/home/yi-hack-v5/script/check_conf.sh
index 4120d12..6047717 100755
--- a/src/static/static/home/yi-hack-v5/script/check_conf.sh
+++ b/src/static/static/home/yi-hack-v5/script/check_conf.sh
@@ -20,6 +20,7 @@ ONVIF=no
 ONVIF_WSDD=yes
 ONVIF_PROFILE=high
 ONVIF_NETIF=wlan0
+TIME_OSD=no
 SNAPSHOT=yes
 SNAPSHOT_LOW=no
 NTPD=yes
diff --git a/src/static/static/home/yi-hack-v5/script/system.sh b/src/static/static/home/yi-hack-v5/script/system.sh
index c2455b1..4d34797 100755
--- a/src/static/static/home/yi-hack-v5/script/system.sh
+++ b/src/static/static/home/yi-hack-v5/script/system.sh
@@ -172,7 +172,10 @@ if [[ $(get_config DISABLE_CLOUD) == "no" ]] ; then
         cd /home/app
         killall dispatch
         LD_PRELOAD=/home/yi-hack-v5/lib/ipc_multiplex.so ./dispatch &
-        sleep 2
+        sleep 3
+        if [[ $(get_config TIME_OSD) == "yes" ]] ; then
+            echo -ne '\x01\x00\x00\x00' | dd of=/tmp/mmap.info bs=1 seek=0 count=4 conv=notrunc
+        fi
         LD_LIBRARY_PATH="/home/yi-hack-v5/lib:/lib:/home/lib:/home/app/locallib:/home/hisiko/hisilib" ./rmm &
         sleep 8
         ./mp4record &
@@ -189,7 +192,10 @@ if [[ $(get_config DISABLE_CLOUD) == "yes" ]] ; then
         cd /home/app
         killall dispatch
         LD_PRELOAD=/home/yi-hack-v5/lib/ipc_multiplex.so ./dispatch &
-        sleep 2
+        sleep 3
+        if [[ $(get_config TIME_OSD) == "yes" ]] ; then
+            echo -ne '\x01\x00\x00\x00' | dd of=/tmp/mmap.info bs=1 seek=0 count=4 conv=notrunc
+        fi
         LD_LIBRARY_PATH="/home/yi-hack-v5/lib:/lib:/home/lib:/home/app/locallib:/home/hisiko/hisilib" ./rmm &
 		sleep 8
         if [[ $(get_config REC_WITHOUT_CLOUD) == "yes" ]] ; then
diff --git a/src/www/httpd/htdocs/js/modules/configurations.js b/src/www/httpd/htdocs/js/modules/configurations.js
index 6add4fb..1aa57a4 100644
--- a/src/www/httpd/htdocs/js/modules/configurations.js
+++ b/src/www/httpd/htdocs/js/modules/configurations.js
@@ -1,6 +1,6 @@
 var APP = APP || {};
 
-APP.configurations = (function ($) {
+APP.configurations = (function($) {
 
     function init() {
         registerEventHandler();
@@ -8,7 +8,7 @@ APP.configurations = (function ($) {
     }
 
     function registerEventHandler() {
-        $(document).on("click", '#button-save', function (e) {
+        $(document).on("click", '#button-save', function(e) {
             saveConfigs();
         });
     }
@@ -24,17 +24,17 @@ APP.configurations = (function ($) {
             success: function(response) {
                 loadingStatusElem.fadeOut(500);
 
-                $.each(response, function (key, state) {
-                    if(key=="HOSTNAME" || key=="TIMEZONE" || key=="NTP_SERVER" || key=="HTTPD_PORT" || key=="RTSP_PORT" || key=="ONVIF_PORT" || key=="USERNAME")
-                        $('input[type="text"][data-key="' + key +'"]').prop('value', state);
-                    else if(key=="RTSP_STREAM" || key=="RTSP_AUDIO" || key=="ONVIF_PROFILE" || key=="ONVIF_NETIF")
-                        $('select[data-key="' + key +'"]').prop('value', state);
-                    else if(key=="PASSWORD" || key=="SSH_PASSWORD")
-                        $('input[type="password"][data-key="' + key +'"]').prop('value', state);
-                    else if(key=="CRONTAB")
+                $.each(response, function(key, state) {
+                    if (key == "HOSTNAME" || key == "TIMEZONE" || key == "NTP_SERVER" || key == "HTTPD_PORT" || key == "RTSP_PORT" || key == "ONVIF_PORT" || key == "USERNAME")
+                        $('input[type="text"][data-key="' + key + '"]').prop('value', state);
+                    else if (key == "RTSP_STREAM" || key == "RTSP_AUDIO" || key == "ONVIF_PROFILE" || key == "ONVIF_NETIF")
+                        $('select[data-key="' + key + '"]').prop('value', state);
+                    else if (key == "PASSWORD" || key == "SSH_PASSWORD")
+                        $('input[type="password"][data-key="' + key + '"]').prop('value', state);
+                    else if (key == "CRONTAB")
                         $('textarea#' + key).prop('value', state);
                     else
-                        $('input[type="checkbox"][data-key="' + key +'"]').prop('checked', state === 'yes');
+                        $('input[type="checkbox"][data-key="' + key + '"]').prop('checked', state === 'yes');
                 });
             },
             error: function(response) {
@@ -51,7 +51,7 @@ APP.configurations = (function ($) {
 
         saveStatusElem.text("Saving...");
 
-        $('.configs-switch input[type="checkbox"]').each(function () {
+        $('.configs-switch input[type="checkbox"]').each(function() {
             configs[$(this).attr('data-key')] = $(this).prop('checked') ? 'yes' : 'no';
         });
 
diff --git a/src/www/httpd/htdocs/pages/configurations.html b/src/www/httpd/htdocs/pages/configurations.html
index 2819fac..d286de8 100644
--- a/src/www/httpd/htdocs/pages/configurations.html
+++ b/src/www/httpd/htdocs/pages/configurations.html
@@ -159,6 +159,23 @@ <h4 class="no-margin">General</h4>
                             </div>
                         </td>
                     </tr>
+                    <tr class="row">
+                        <td>Enable/disable time OSD</td>
+                        <td>
+                            <label class="switch small">
+                                <input type="checkbox" data-key="TIME_OSD"/>
+                                <span class="slider round"></span>
+                                <span class="switch-text"></span>
+                            </label>
+                            <span class="switch-description">
+                                Enable/disable time OSD in the upper left corner.
+                            </span>
+                                <br/>
+                            <span class="italic">
+                                It works only if the cam doesn't show osd natively.
+                            </span>
+                        </td>
+                    </tr>
                     <tr class="row">
                         <td>Snapshot</td>
                         <td>

From 91251dc19e2edbbab196a7363cb7bbea8d117860 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Mon, 2 Oct 2023 09:00:04 +0100
Subject: [PATCH 32/81] [Pre-Release] 0.4.1b  Changes to be committed: 
 modified:   VERSION

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 39bbca7..719a94a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.1a
+0.4.1b

From 20fb8bd57b2b349c12f8fc75e2c20824d08a0a43 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Mon, 20 Nov 2023 19:09:44 +0000
Subject: [PATCH 33/81] [Upgrade] wpa_supplicant v2.10 & OpenSSL 1.1.1w 
 Changes to be committed: 	modified:   src/curl/init.curl 	modified:  
 src/static/static/home/yi-hack-v5/script/system.sh 	new file:  
 src/wpa/.config 	new file:   src/wpa/.gitignore 	new file:  
 src/wpa/cleanup.wpa 	new file:   src/wpa/compile.wpa 	new file:  
 src/wpa/init.wpa 	new file:   src/wpa/install.wpa

---
 src/curl/init.curl                            |   6 +-
 .../static/home/yi-hack-v5/script/system.sh   |  19 +-
 src/wpa/.config                               | 636 ++++++++++++++++++
 src/wpa/.gitignore                            |   8 +
 src/wpa/cleanup.wpa                           |   9 +
 src/wpa/compile.wpa                           |  17 +
 src/wpa/init.wpa                              |  64 ++
 src/wpa/install.wpa                           |  12 +
 8 files changed, 767 insertions(+), 4 deletions(-)
 create mode 100644 src/wpa/.config
 create mode 100644 src/wpa/.gitignore
 create mode 100755 src/wpa/cleanup.wpa
 create mode 100755 src/wpa/compile.wpa
 create mode 100755 src/wpa/init.wpa
 create mode 100755 src/wpa/install.wpa

diff --git a/src/curl/init.curl b/src/curl/init.curl
index ec0c524..87b8ff7 100755
--- a/src/curl/init.curl
+++ b/src/curl/init.curl
@@ -10,9 +10,9 @@ rm -rf ./openssl*
 
 #git reset --hard || exit 1
 
-wget https://www.openssl.org/source/openssl-1.1.1q.tar.gz
-tar zxf openssl-1.1.1q.tar.gz
-pushd openssl-1.1.1q
+wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz
+tar zxf openssl-1.1.1w.tar.gz
+pushd openssl-1.1.1w
 ./Configure linux-generic32 shared -DL_ENDIAN --prefix=${PREFIX} --openssldir=${PREFIX} shared
 make CROSS_COMPILE=arm-hisiv300-linux- LD=arm-hisiv300-linux-ld AR=arm-hisiv300-linux-ar NM=arm-hisiv300-linux-nm AS=arm-hisiv300-linux-as install
 
diff --git a/src/static/static/home/yi-hack-v5/script/system.sh b/src/static/static/home/yi-hack-v5/script/system.sh
index 4d34797..ea003db 100755
--- a/src/static/static/home/yi-hack-v5/script/system.sh
+++ b/src/static/static/home/yi-hack-v5/script/system.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# 0.4.1a
+# 0.4.1c
 
 CONF_FILE="etc/system.conf"
 
@@ -28,6 +28,23 @@ export PATH=/usr/bin:/usr/sbin:/bin:/sbin:/home/base/tools:/home/yi-hack-v5/bin:
 #  ln -sf /dev/null /var/run/utmp
 #fi
 
+# Upgrade wpa_supplicant modules
+ifconfig wlan0 up
+if [ -f /tmp/sd/yi-hack-v5/wpa/wpa_supplicant ]; then
+    echo "---backing up wpa---"
+    cp /home/base/tools/wpa_supplicant /tmp/sd/yi-hack-v5/wpa/wpa_supplicant_backup
+    cp /home/base/tools/wpa_cli /tmp/sd/yi-hack-v5/wpa/wpa_cli_backup
+    cp /home/base/tools/wpa_passphrase /tmp/sd/yi-hack-v5/wpa/wpa_passphrase_backup
+    killall watch_process
+    killall wpa*
+    mv /tmp/sd/yi-hack-v5/wpa/*.so* /home/lib/
+    mv /tmp/sd/yi-hack-v5/wpa/wpa_* /home/base/tools/
+    reboot
+	echo "---wpa upgrade done---"
+else
+	echo "---no wpa upgrade---"
+fi
+
 #reversing symlinks
 if [ -L "/var/run/utmp" ]; then
   rm /var/run/utmp
diff --git a/src/wpa/.config b/src/wpa/.config
new file mode 100644
index 0000000..3be9eb0
--- /dev/null
+++ b/src/wpa/.config
@@ -0,0 +1,636 @@
+# Example wpa_supplicant build time configuration
+#
+# This file lists the configuration options that are used when building the
+# wpa_supplicant binary. All lines starting with # are ignored. Configuration
+# option lines must be commented out complete, if they are not to be included,
+# i.e., just setting VARIABLE=n is not disabling that variable.
+#
+# This file is included in Makefile, so variables like CFLAGS and LIBS can also
+# be modified from here. In most cases, these lines should use += in order not
+# to override previous values of the variables.
+
+
+# Uncomment following two lines and fix the paths if you have installed OpenSSL
+# or GnuTLS in non-default location
+CFLAGS += -I/home/dev/333hack/src/wpa/sysroot/include/openssl
+LIBS += -L/home/dev/333hack/src/wpa/sysroot/lib
+#LDFLAGS += -static
+
+# Some Red Hat versions seem to include kerberos header files from OpenSSL, but
+# the kerberos files are not in the default include path. Following line can be
+# used to fix build issues on such systems (krb5.h not found).
+#CFLAGS += -I/usr/include/kerberos
+
+# Driver interface for generic Linux wireless extensions
+# Note: WEXT is deprecated in the current Linux kernel version and no new
+# functionality is added to it. nl80211-based interface is the new
+# replacement for WEXT and its use allows wpa_supplicant to properly control
+# the driver to improve existing functionality like roaming and to support new
+# functionality.
+CONFIG_DRIVER_WEXT=y
+
+# Driver interface for Linux drivers using the nl80211 kernel interface
+#CONFIG_DRIVER_NL80211=y
+
+# QCA vendor extensions to nl80211
+#CONFIG_DRIVER_NL80211_QCA=y
+
+# driver_nl80211.c requires libnl. If you are compiling it yourself
+# you may need to point hostapd to your version of libnl.
+#
+#CFLAGS += -I$<path to libnl include files>
+#LIBS += -L$<path to libnl library files>
+
+# Use libnl v2.0 (or 3.0) libraries.
+#CONFIG_LIBNL20=y
+
+# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored)
+CONFIG_LIBNL32=y
+
+
+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
+#CONFIG_DRIVER_BSD=y
+#CFLAGS += -I/usr/local/include
+#LIBS += -L/usr/local/lib
+LIBS_p += -L/home/dev/333hack/src/wpa/sysroot/lib
+LIBS_c += -L/home/dev/333hack/src/wpa/sysroot/lib
+
+# Driver interface for Windows NDIS
+#CONFIG_DRIVER_NDIS=y
+#CFLAGS += -I/usr/include/w32api/ddk
+#LIBS += -L/usr/local/lib
+# For native build using mingw
+#CONFIG_NATIVE_WINDOWS=y
+# Additional directories for cross-compilation on Linux host for mingw target
+#CFLAGS += -I/opt/mingw/mingw32/include/ddk
+#LIBS += -L/opt/mingw/mingw32/lib
+CC=arm-hisiv300-linux-gcc
+# By default, driver_ndis uses WinPcap for low-level operations. This can be
+# replaced with the following option which replaces WinPcap calls with NDISUIO.
+# However, this requires that WZC is disabled (net stop wzcsvc) before starting
+# wpa_supplicant.
+# CONFIG_USE_NDISUIO=y
+
+# Driver interface for wired Ethernet drivers
+#CONFIG_DRIVER_WIRED=y
+
+# Driver interface for MACsec capable Qualcomm Atheros drivers
+#CONFIG_DRIVER_MACSEC_QCA=y
+
+# Driver interface for Linux MACsec drivers
+#CONFIG_DRIVER_MACSEC_LINUX=y
+
+# Driver interface for the Broadcom RoboSwitch family
+#CONFIG_DRIVER_ROBOSWITCH=y
+
+# Driver interface for no driver (e.g., WPS ER only)
+#CONFIG_DRIVER_NONE=y
+
+# Solaris libraries
+#LIBS += -lsocket -ldlpi -lnsl
+#LIBS_c += -lsocket
+
+# Enable IEEE 802.1X Supplicant (automatically included if any EAP method or
+# MACsec is included)
+#CONFIG_IEEE8021X_EAPOL=y
+
+# EAP-MD5
+#CONFIG_EAP_MD5=y
+
+# EAP-MSCHAPv2
+#CONFIG_EAP_MSCHAPV2=y
+
+# EAP-TLS
+#CONFIG_EAP_TLS=y
+
+# EAL-PEAP
+#CONFIG_EAP_PEAP=y
+
+# EAP-TTLS
+#CONFIG_EAP_TTLS=y
+
+# EAP-FAST
+#CONFIG_EAP_FAST=y
+
+# EAP-TEAP
+# Note: The current EAP-TEAP implementation is experimental and should not be
+# enabled for production use. The IETF RFC 7170 that defines EAP-TEAP has number
+# of conflicting statements and missing details and the implementation has
+# vendor specific workarounds for those and as such, may not interoperate with
+# any other implementation. This should not be used for anything else than
+# experimentation and interoperability testing until those issues has been
+# resolved.
+#CONFIG_EAP_TEAP=y
+
+# EAP-GTC
+#CONFIG_EAP_GTC=y
+
+# EAP-OTP
+#CONFIG_EAP_OTP=y
+
+# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
+#CONFIG_EAP_SIM=y
+
+# Enable SIM simulator (Milenage) for EAP-SIM
+#CONFIG_SIM_SIMULATOR=y
+
+# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
+#CONFIG_EAP_PSK=y
+
+# EAP-pwd (secure authentication using only a password)
+#CONFIG_EAP_PWD=y
+
+# EAP-PAX
+#CONFIG_EAP_PAX=y
+
+# LEAP
+#CONFIG_EAP_LEAP=y
+
+# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
+#CONFIG_EAP_AKA=y
+
+# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used).
+# This requires CONFIG_EAP_AKA to be enabled, too.
+#CONFIG_EAP_AKA_PRIME=y
+
+# Enable USIM simulator (Milenage) for EAP-AKA
+#CONFIG_USIM_SIMULATOR=y
+
+# EAP-SAKE
+#CONFIG_EAP_SAKE=y
+
+# EAP-GPSK
+CONFIG_EAP_GPSK=y
+# Include support for optional SHA256 cipher suite in EAP-GPSK
+#CONFIG_EAP_GPSK_SHA256=y
+
+# EAP-TNC and related Trusted Network Connect support (experimental)
+#CONFIG_EAP_TNC=y
+
+# Wi-Fi Protected Setup (WPS)
+CONFIG_WPS=y
+# Enable WPS external registrar functionality
+#CONFIG_WPS_ER=y
+# Disable credentials for an open network by default when acting as a WPS
+# registrar.
+#CONFIG_WPS_REG_DISABLE_OPEN=y
+# Enable WPS support with NFC config method
+#CONFIG_WPS_NFC=y
+
+# EAP-IKEv2
+#CONFIG_EAP_IKEV2=y
+
+# EAP-EKE
+#CONFIG_EAP_EKE=y
+
+# MACsec
+#CONFIG_MACSEC=y
+
+# PKCS#12 (PFX) support (used to read private key and certificate file from
+# a file that usually has extension .p12 or .pfx)
+#CONFIG_PKCS12=y
+
+# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
+# engine.
+#CONFIG_SMARTCARD=y
+
+# PC/SC interface for smartcards (USIM, GSM SIM)
+# Enable this if EAP-SIM or EAP-AKA is included
+#CONFIG_PCSC=y
+
+# Support HT overrides (disable HT/HT40, mask MCS rates, etc.)
+#CONFIG_HT_OVERRIDES=y
+
+# Support VHT overrides (disable VHT, mask MCS rates, etc.)
+#CONFIG_VHT_OVERRIDES=y
+
+# Development testing
+#CONFIG_EAPOL_TEST=y
+
+# Select control interface backend for external programs, e.g, wpa_cli:
+# unix = UNIX domain sockets (default for Linux/BSD)
+# udp = UDP sockets using localhost (127.0.0.1)
+# udp6 = UDP IPv6 sockets using localhost (::1)
+# named_pipe = Windows Named Pipe (default for Windows)
+# udp-remote = UDP sockets with remote access (only for tests systems/purpose)
+# udp6-remote = UDP IPv6 sockets with remote access (only for tests purpose)
+# y = use default (backwards compatibility)
+# If this option is commented out, control interface is not included in the
+# build.
+CONFIG_CTRL_IFACE=y
+
+# Include support for GNU Readline and History Libraries in wpa_cli.
+# When building a wpa_cli binary for distribution, please note that these
+# libraries are licensed under GPL and as such, BSD license may not apply for
+# the resulting binary.
+#CONFIG_READLINE=y
+
+# Include internal line edit mode in wpa_cli. This can be used as a replacement
+# for GNU Readline to provide limited command line editing and history support.
+#CONFIG_WPA_CLI_EDIT=y
+
+# Remove debugging code that is printing out debug message to stdout.
+# This can be used to reduce the size of the wpa_supplicant considerably
+# if debugging code is not needed. The size reduction can be around 35%
+# (e.g., 90 kB).
+#CONFIG_NO_STDOUT_DEBUG=y
+
+# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
+# 35-50 kB in code size.
+#CONFIG_NO_WPA=y
+
+# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support
+# This option can be used to reduce code size by removing support for
+# converting ASCII passphrases into PSK. If this functionality is removed, the
+# PSK can only be configured as the 64-octet hexstring (e.g., from
+# wpa_passphrase). This saves about 0.5 kB in code size.
+#CONFIG_NO_WPA_PASSPHRASE=y
+
+# Simultaneous Authentication of Equals (SAE), WPA3-Personal
+CONFIG_SAE=y
+
+# Disable scan result processing (ap_scan=1) to save code size by about 1 kB.
+# This can be used if ap_scan=1 mode is never enabled.
+#CONFIG_NO_SCAN_PROCESSING=y
+
+# Select configuration backend:
+# file = text file (e.g., wpa_supplicant.conf; note: the configuration file
+#	path is given on command line, not here; this option is just used to
+#	select the backend that allows configuration files to be used)
+# winreg = Windows registry (see win_example.reg for an example)
+CONFIG_BACKEND=file
+
+# Remove configuration write functionality (i.e., to allow the configuration
+# file to be updated based on runtime configuration changes). The runtime
+# configuration can still be changed, the changes are just not going to be
+# persistent over restarts. This option can be used to reduce code size by
+# about 3.5 kB.
+#CONFIG_NO_CONFIG_WRITE=y
+
+# Remove support for configuration blobs to reduce code size by about 1.5 kB.
+#CONFIG_NO_CONFIG_BLOBS=y
+
+# Select program entry point implementation:
+# main = UNIX/POSIX like main() function (default)
+# main_winsvc = Windows service (read parameters from registry)
+# main_none = Very basic example (development use only)
+#CONFIG_MAIN=main
+
+# Select wrapper for operating system and C library specific functions
+# unix = UNIX/POSIX like systems (default)
+# win32 = Windows systems
+# none = Empty template
+#CONFIG_OS=unix
+
+# Select event loop implementation
+# eloop = select() loop (default)
+# eloop_win = Windows events and WaitForMultipleObject() loop
+#CONFIG_ELOOP=eloop
+
+# Should we use poll instead of select? Select is used by default.
+#CONFIG_ELOOP_POLL=y
+
+# Should we use epoll instead of select? Select is used by default.
+#CONFIG_ELOOP_EPOLL=y
+
+# Should we use kqueue instead of select? Select is used by default.
+#CONFIG_ELOOP_KQUEUE=y
+
+# Select layer 2 packet implementation
+# linux = Linux packet socket (default)
+# pcap = libpcap/libdnet/WinPcap
+# freebsd = FreeBSD libpcap
+# winpcap = WinPcap with receive thread
+# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
+# none = Empty template
+CONFIG_L2_PACKET=linux
+
+# Disable Linux packet socket workaround applicable for station interface
+# in a bridge for EAPOL frames. This should be uncommented only if the kernel
+# is known to not have the regression issue in packet socket behavior with
+# bridge interfaces (commit 'bridge: respect RFC2863 operational state')
+#CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y
+
+# Support Operating Channel Validation
+#CONFIG_OCV=y
+
+# Select TLS implementation
+# openssl = OpenSSL (default)
+# gnutls = GnuTLS
+# internal = Internal TLSv1 implementation (experimental)
+# linux = Linux kernel AF_ALG and internal TLSv1 implementation (experimental)
+# none = Empty template
+#CONFIG_TLS=none
+
+# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1)
+# can be enabled to get a stronger construction of messages when block ciphers
+# are used. It should be noted that some existing TLS v1.0 -based
+# implementation may not be compatible with TLS v1.1 message (ClientHello is
+# sent prior to negotiating which version will be used)
+#CONFIG_TLSV11=y
+
+# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2)
+# can be enabled to enable use of stronger crypto algorithms. It should be
+# noted that some existing TLS v1.0 -based implementation may not be compatible
+# with TLS v1.2 message (ClientHello is sent prior to negotiating which version
+# will be used)
+#CONFIG_TLSV12=y
+
+# Select which ciphers to use by default with OpenSSL if the user does not
+# specify them.
+#CONFIG_TLS_DEFAULT_CIPHERS="DEFAULT:!EXP:!LOW"
+
+# If CONFIG_TLS=internal is used, additional library and include paths are
+# needed for LibTomMath. Alternatively, an integrated, minimal version of
+# LibTomMath can be used. See beginning of libtommath.c for details on benefits
+# and drawbacks of this option.
+#CONFIG_INTERNAL_LIBTOMMATH=y
+#ifndef CONFIG_INTERNAL_LIBTOMMATH
+#LTM_PATH=/usr/src/libtommath-0.39
+#CFLAGS += -I$(LTM_PATH)
+#LIBS += -L$(LTM_PATH)
+#LIBS_p += -L$(LTM_PATH)
+#endif
+# At the cost of about 4 kB of additional binary size, the internal LibTomMath
+# can be configured to include faster routines for exptmod, sqr, and div to
+# speed up DH and RSA calculation considerably
+#CONFIG_INTERNAL_LIBTOMMATH_FAST=y
+
+# Include NDIS event processing through WMI into wpa_supplicant/wpasvc.
+# This is only for Windows builds and requires WMI-related header files and
+# WbemUuid.Lib from Platform SDK even when building with MinGW.
+#CONFIG_NDIS_EVENTS_INTEGRATED=y
+#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
+
+# Add support for new DBus control interface
+# (fi.w1.wpa_supplicant1)
+#CONFIG_CTRL_IFACE_DBUS_NEW=y
+
+# Add introspection support for new DBus control interface
+#CONFIG_CTRL_IFACE_DBUS_INTRO=y
+
+# Add support for loading EAP methods dynamically as shared libraries.
+# When this option is enabled, each EAP method can be either included
+# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
+# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to
+# be loaded in the beginning of the wpa_supplicant configuration file
+# (see load_dynamic_eap parameter in the example file) before being used in
+# the network blocks.
+#
+# Note that some shared parts of EAP methods are included in the main program
+# and in order to be able to use dynamic EAP methods using these parts, the
+# main program must have been build with the EAP method enabled (=y or =dyn).
+# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries
+# unless at least one of them was included in the main build to force inclusion
+# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included
+# in the main build to be able to load these methods dynamically.
+#
+# Please also note that using dynamic libraries will increase the total binary
+# size. Thus, it may not be the best option for targets that have limited
+# amount of memory/flash.
+#CONFIG_DYNAMIC_EAP_METHODS=y
+
+# IEEE Std 802.11r-2008 (Fast BSS Transition) for station mode
+CONFIG_IEEE80211R=y
+
+# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
+CONFIG_DEBUG_FILE=y
+
+# Send debug messages to syslog instead of stdout
+CONFIG_DEBUG_SYSLOG=y
+# Set syslog facility for debug messages
+#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
+
+# Add support for sending all debug messages (regardless of debug verbosity)
+# to the Linux kernel tracing facility. This helps debug the entire stack by
+# making it easy to record everything happening from the driver up into the
+# same file, e.g., using trace-cmd.
+#CONFIG_DEBUG_LINUX_TRACING=y
+
+# Add support for writing debug log to Android logcat instead of standard
+# output
+#CONFIG_ANDROID_LOG=y
+
+# Enable privilege separation (see README 'Privilege separation' for details)
+#CONFIG_PRIVSEP=y
+
+# Enable mitigation against certain attacks against TKIP by delaying Michael
+# MIC error reports by a random amount of time between 0 and 60 seconds
+#CONFIG_DELAYED_MIC_ERROR_REPORT=y
+
+# Enable tracing code for developer debugging
+# This tracks use of memory allocations and other registrations and reports
+# incorrect use with a backtrace of call (or allocation) location.
+#CONFIG_WPA_TRACE=y
+# For BSD, uncomment these.
+#LIBS += -lexecinfo
+#LIBS_p += -lexecinfo
+#LIBS_c += -lexecinfo
+
+# Use libbfd to get more details for developer debugging
+# This enables use of libbfd to get more detailed symbols for the backtraces
+# generated by CONFIG_WPA_TRACE=y.
+#CONFIG_WPA_TRACE_BFD=y
+# For BSD, uncomment these.
+#LIBS += -lbfd -liberty -lz
+#LIBS_p += -lbfd -liberty -lz
+#LIBS_c += -lbfd -liberty -lz
+
+# wpa_supplicant depends on strong random number generation being available
+# from the operating system. os_get_random() function is used to fetch random
+# data when needed, e.g., for key generation. On Linux and BSD systems, this
+# works by reading /dev/urandom. It should be noted that the OS entropy pool
+# needs to be properly initialized before wpa_supplicant is started. This is
+# important especially on embedded devices that do not have a hardware random
+# number generator and may by default start up with minimal entropy available
+# for random number generation.
+#
+# As a safety net, wpa_supplicant is by default trying to internally collect
+# additional entropy for generating random data to mix in with the data fetched
+# from the OS. This by itself is not considered to be very strong, but it may
+# help in cases where the system pool is not initialized properly. However, it
+# is very strongly recommended that the system pool is initialized with enough
+# entropy either by using hardware assisted random number generator or by
+# storing state over device reboots.
+#
+# wpa_supplicant can be configured to maintain its own entropy store over
+# restarts to enhance random number generation. This is not perfect, but it is
+# much more secure than using the same sequence of random numbers after every
+# reboot. This can be enabled with -e<entropy file> command line option. The
+# specified file needs to be readable and writable by wpa_supplicant.
+#
+# If the os_get_random() is known to provide strong random data (e.g., on
+# Linux/BSD, the board in question is known to have reliable source of random
+# data from /dev/urandom), the internal wpa_supplicant random pool can be
+# disabled. This will save some in binary size and CPU use. However, this
+# should only be considered for builds that are known to be used on devices
+# that meet the requirements described above.
+#CONFIG_NO_RANDOM_POOL=y
+
+# Should we attempt to use the getrandom(2) call that provides more reliable
+# yet secure randomness source than /dev/random on Linux 3.17 and newer.
+# Requires glibc 2.25 to build, falls back to /dev/random if unavailable.
+#CONFIG_GETRANDOM=y
+
+# IEEE 802.11ac (Very High Throughput) support (mainly for AP mode)
+#CONFIG_IEEE80211AC=y
+
+# Wireless Network Management (IEEE Std 802.11v-2011)
+# Note: This is experimental and not complete implementation.
+#CONFIG_WNM=y
+
+# Interworking (IEEE 802.11u)
+# This can be used to enable functionality to improve interworking with
+# external networks (GAS/ANQP to learn more about the networks and network
+# selection based on available credentials).
+CONFIG_INTERWORKING=y
+
+# Hotspot 2.0 <<< DONT TOUCH
+CONFIG_HS20=y
+
+# Enable interface matching in wpa_supplicant
+#CONFIG_MATCH_IFACE=y
+
+# Disable roaming in wpa_supplicant
+#CONFIG_NO_ROAMING=y
+
+# AP mode operations with wpa_supplicant
+# This can be used for controlling AP mode operations with wpa_supplicant. It
+# should be noted that this is mainly aimed at simple cases like
+# WPA2-Personal while more complex configurations like WPA2-Enterprise with an
+# external RADIUS server can be supported with hostapd.
+#CONFIG_AP=y
+
+# P2P (Wi-Fi Direct)
+# This can be used to enable P2P support in wpa_supplicant. See README-P2P for
+# more information on P2P operations.
+#CONFIG_P2P=y
+
+# Enable TDLS support
+#CONFIG_TDLS=y
+
+# Wi-Fi Display
+# This can be used to enable Wi-Fi Display extensions for P2P using an external
+# program to control the additional information exchanges in the messages.
+#CONFIG_WIFI_DISPLAY=y
+
+# Autoscan
+# This can be used to enable automatic scan support in wpa_supplicant.
+# See wpa_supplicant.conf for more information on autoscan usage.
+#
+# Enabling directly a module will enable autoscan support.
+# For exponential module:
+#CONFIG_AUTOSCAN_EXPONENTIAL=y
+# For periodic module:
+#CONFIG_AUTOSCAN_PERIODIC=y
+
+# Password (and passphrase, etc.) backend for external storage
+# These optional mechanisms can be used to add support for storing passwords
+# and other secrets in external (to wpa_supplicant) location. This allows, for
+# example, operating system specific key storage to be used
+#
+# External password backend for testing purposes (developer use)
+#CONFIG_EXT_PASSWORD_TEST=y
+# File-based backend to read passwords from an external file.
+#CONFIG_EXT_PASSWORD_FILE=y
+
+# Enable Fast Session Transfer (FST)
+#CONFIG_FST=y
+
+# Enable CLI commands for FST testing
+#CONFIG_FST_TEST=y
+
+# OS X builds. This is only for building eapol_test.
+#CONFIG_OSX=y
+
+# Automatic Channel Selection
+# This will allow wpa_supplicant to pick the channel automatically when channel
+# is set to "0".
+#
+# TODO: Extend parser to be able to parse "channel=acs_survey" as an alternative
+# to "channel=0". This would enable us to eventually add other ACS algorithms in
+# similar way.
+#
+# Automatic selection is currently only done through initialization, later on
+# we hope to do background checks to keep us moving to more ideal channels as
+# time goes by. ACS is currently only supported through the nl80211 driver and
+# your driver must have survey dump capability that is filled by the driver
+# during scanning.
+#
+# TODO: In analogy to hostapd be able to customize the ACS survey algorithm with
+# a newly to create wpa_supplicant.conf variable acs_num_scans.
+#
+# Supported ACS drivers:
+# * ath9k
+# * ath5k
+# * ath10k
+#
+# For more details refer to:
+# http://wireless.kernel.org/en/users/Documentation/acs
+#CONFIG_ACS=y
+
+# Support Multi Band Operation
+#CONFIG_MBO=y
+
+# Fast Initial Link Setup (FILS) (IEEE 802.11ai)
+#CONFIG_FILS=y
+# FILS shared key authentication with PFS
+#CONFIG_FILS_SK_PFS=y
+
+# Support RSN on IBSS networks
+# This is needed to be able to use mode=1 network profile with proto=RSN and
+# key_mgmt=WPA-PSK (i.e., full key management instead of WPA-None).
+CONFIG_IBSS_RSN=y
+
+# External PMKSA cache control
+# This can be used to enable control interface commands that allow the current
+# PMKSA cache entries to be fetched and new entries to be added.
+#CONFIG_PMKSA_CACHE_EXTERNAL=y
+
+# Mesh Networking (IEEE 802.11s)
+#CONFIG_MESH=y
+
+# Background scanning modules
+# These can be used to request wpa_supplicant to perform background scanning
+# operations for roaming within an ESS (same SSID). See the bgscan parameter in
+# the wpa_supplicant.conf file for more details.
+# Periodic background scans based on signal strength
+CONFIG_BGSCAN_SIMPLE=y
+# Learn channels used by the network and try to avoid bgscans on other
+# channels (experimental)
+#CONFIG_BGSCAN_LEARN=y
+
+# Opportunistic Wireless Encryption (OWE)
+# Experimental implementation of draft-harkins-owe-07.txt
+#CONFIG_OWE=y
+
+# Device Provisioning Protocol (DPP) (also known as Wi-Fi Easy Connect)
+CONFIG_DPP=y
+# DPP version 2 support
+CONFIG_DPP2=y
+# DPP version 3 support (experimental and still changing; do not enable for
+# production use)
+#CONFIG_DPP3=y
+
+# Wired equivalent privacy (WEP)
+# WEP is an obsolete cryptographic data confidentiality algorithm that is not
+# considered secure. It should not be used for anything anymore. The
+# functionality needed to use WEP is available in the current wpa_supplicant
+# release under this optional build parameter. This functionality is subject to
+# be completely removed in a future release.
+#CONFIG_WEP=y
+
+# Remove all TKIP functionality
+# TKIP is an old cryptographic data confidentiality algorithm that is not
+# considered secure. It should not be used anymore for anything else than a
+# backwards compatibility option as a group cipher when connecting to APs that
+# use WPA+WPA2 mixed mode. For now, the default wpa_supplicant build includes
+# support for this by default, but that functionality is subject to be removed
+# in the future.
+#CONFIG_NO_TKIP=y
+
+# Pre-Association Security Negotiation (PASN)
+# Experimental implementation based on IEEE P802.11z/D2.6 and the protocol
+# design is still subject to change. As such, this should not yet be enabled in
+# production use.
+#CONFIG_PASN=y
diff --git a/src/wpa/.gitignore b/src/wpa/.gitignore
new file mode 100644
index 0000000..bde5e9e
--- /dev/null
+++ b/src/wpa/.gitignore
@@ -0,0 +1,8 @@
+# Ignore the install dir
+_install/
+dbus*
+expat*
+libnl*
+openssl*
+wpa_supplicant*
+sysroot/
diff --git a/src/wpa/cleanup.wpa b/src/wpa/cleanup.wpa
new file mode 100755
index 0000000..aa32c30
--- /dev/null
+++ b/src/wpa/cleanup.wpa
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+cd $SCRIPT_DIR
+
+rm -rf libnl*
+rm -rf openssl*
+rm -rf wpa_supplicant*
+
diff --git a/src/wpa/compile.wpa b/src/wpa/compile.wpa
new file mode 100755
index 0000000..206d3e7
--- /dev/null
+++ b/src/wpa/compile.wpa
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+PREFIX=$(pwd)/sysroot
+cd $SCRIPT_DIR
+
+rsync -r ./openssl-1.1.1w/include/openssl/ wpa_supplicant-2.10/wpa_supplicant/src
+cd wpa_supplicant-2.10/wpa_supplicant || exit 1
+
+export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig
+
+#cp defconfig .config
+#make CC=arm-hisiv300-linux-gcc CFLAGS=-I$SCRIPT_DIR/sysroot/openssl/include LIBS=-L$SCRIPT_DIR/sysroot/openssl/lib \
+make clean
+make
+make install DESTDIR="$SCRIPT_DIR/_install"
+arm-hisiv300-linux-strip $SCRIPT_DIR/_install/usr/local/sbin/*
diff --git a/src/wpa/init.wpa b/src/wpa/init.wpa
new file mode 100755
index 0000000..33b3f80
--- /dev/null
+++ b/src/wpa/init.wpa
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+PREFIX=$(pwd)/sysroot
+cd $SCRIPT_DIR
+
+rm -rf ./_install
+rm -rf ./sysroot
+rm -rf ./openssl*
+rm -rf ./expat*
+rm -rf ./dbus*
+rm -rf ./libnl*
+
+#git reset --hard || exit 1
+
+wget -c https://www.openssl.org/source/openssl-1.1.1w.tar.gz
+wget -c https://www.infradead.org/~tgr/libnl/files/libnl-3.2.25.tar.gz
+wget -c https://w1.fi/releases/wpa_supplicant-2.10.tar.gz
+wget -c https://dbus.freedesktop.org/releases/dbus/dbus-1.15.8.tar.xz
+wget -c https://github.com/libexpat/libexpat/releases/download/R_2_5_0/expat-2.5.0.tar.gz
+
+tar zxf openssl-1.1.1w.tar.gz
+tar -xf libnl-3.2.25.tar.gz
+tar zxf wpa_supplicant-2.10.tar.gz
+tar -xf dbus-1.15.8.tar.xz
+tar zxf expat-2.5.0.tar.gz
+cp .config wpa_supplicant-2.10/wpa_supplicant
+
+#cp wpa_supplicant-2.10/wpa_supplicant/defconfig wpa_supplicant-2.10/wpa_supplicant/.config
+
+pushd openssl-1.1.1w
+
+#./Configure --cross-compile-prefix=arm-hisiv300-linux- linux-generic32 -DL_ENDIAN --prefix=/${PREFIX} --openssldir=/${PREFIX}
+#make CC=arm-hisiv300-linux-gcc LD=arm-hisiv300-linux-ld RANLIB=arm-hisiv300-linux-ranlib MAKEDEPPROG=arm-hisiv300-linux-gcc PROCESSOR=ARM install  
+
+./Configure --cross-compile-prefix=arm-hisiv300-linux- linux-generic32 -DL_ENDIAN -no-async --prefix=/${PREFIX} --openssldir=/${PREFIX}
+make install
+
+popd
+
+pushd libnl-3.2.25
+
+./configure --host=arm-hisiv300-linux --prefix=${PREFIX}
+make CROSS_COMPILE=arm-hisiv300-linux- LD=arm-hisiv300-linux-ld AR=arm-hisiv300-linux-ar NM=arm-hisiv300-linux-nm AS=arm-hisiv300-linux-as install
+export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig
+
+popd
+
+pushd expat-2.5.0
+
+./configure --host=arm-hisiv300-linux --prefix=${PREFIX} CC=arm-hisiv300-linux-gcc
+make
+make install 
+
+popd
+
+pushd dbus-1.15.8
+
+./autogen.sh
+./configure --prefix=${PREFIX} --host=arm-hisiv300-linux --with-x=no ac_cv_have_abstract_sockets=yes "CC=arm-hisiv300-linux-gcc -I${PREFIX}/include -L${PREFIX}/lib"
+make
+make install
+
+popd
diff --git a/src/wpa/install.wpa b/src/wpa/install.wpa
new file mode 100755
index 0000000..cfc90ed
--- /dev/null
+++ b/src/wpa/install.wpa
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+cd $SCRIPT_DIR
+
+# Compress the file
+#upx ./_install/sbin/curl
+
+mkdir -p ../../build/home/yi-hack-v5/wpa/
+
+rsync -a ./_install/usr/local/sbin ../../build/home/yi-hack-v5/wpa/
+cp ./sysroot/lib/libcryopto.so.1.1 ../../build/home/yi-hack-v5/wpa/

From ff800a1dd3c0bfdc288c2ff956c43192b90b360f Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Mon, 20 Nov 2023 19:52:58 +0000
Subject: [PATCH 34/81] [Fix] OpenSSL src  Changes to be committed: 
 modified:   compile.wpa

---
 src/wpa/compile.wpa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wpa/compile.wpa b/src/wpa/compile.wpa
index 206d3e7..977bd08 100755
--- a/src/wpa/compile.wpa
+++ b/src/wpa/compile.wpa
@@ -4,7 +4,7 @@ SCRIPT_DIR=$(cd `dirname $0` && pwd)
 PREFIX=$(pwd)/sysroot
 cd $SCRIPT_DIR
 
-rsync -r ./openssl-1.1.1w/include/openssl/ wpa_supplicant-2.10/wpa_supplicant/src
+cp -r openssl-1.1.1w/include/openssl wpa_supplicant-2.10/src/
 cd wpa_supplicant-2.10/wpa_supplicant || exit 1
 
 export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig

From 050b5ce922bc7ef31ee26c9f5c25ba082c141b0a Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Mon, 20 Nov 2023 19:54:11 +0000
Subject: [PATCH 35/81] [Clean] wpa_supplicant clearance  Changes to be
 committed: 	modified:   init.wpa

---
 src/wpa/init.wpa | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/wpa/init.wpa b/src/wpa/init.wpa
index 33b3f80..ff1d1c2 100755
--- a/src/wpa/init.wpa
+++ b/src/wpa/init.wpa
@@ -10,6 +10,7 @@ rm -rf ./openssl*
 rm -rf ./expat*
 rm -rf ./dbus*
 rm -rf ./libnl*
+rm -rf ./wpa_*
 
 #git reset --hard || exit 1
 

From d3321c965acc0d9e1ef2d65b7361531d58c1a6f3 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Mon, 20 Nov 2023 20:17:19 +0000
Subject: [PATCH 36/81] [Fix] Install typo  Changes to be committed: 
 modified:   install.wpa

---
 src/wpa/install.wpa | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wpa/install.wpa b/src/wpa/install.wpa
index cfc90ed..f91a4f7 100755
--- a/src/wpa/install.wpa
+++ b/src/wpa/install.wpa
@@ -8,5 +8,5 @@ cd $SCRIPT_DIR
 
 mkdir -p ../../build/home/yi-hack-v5/wpa/
 
-rsync -a ./_install/usr/local/sbin ../../build/home/yi-hack-v5/wpa/
-cp ./sysroot/lib/libcryopto.so.1.1 ../../build/home/yi-hack-v5/wpa/
+rsync -a ./_install/usr/local/sbin/ ../../build/home/yi-hack-v5/wpa/
+cp sysroot/lib/libcrypto.so.1.1 ../../build/home/yi-hack-v5/wpa/

From 3af63bc4180f3eba630de1027d4f907e2d1e5de5 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Mon, 20 Nov 2023 20:21:24 +0000
Subject: [PATCH 37/81] [Fix] Install typo part 2  Changes to be committed: 
 modified:   install.wpa

---
 src/wpa/install.wpa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wpa/install.wpa b/src/wpa/install.wpa
index f91a4f7..b74ebde 100755
--- a/src/wpa/install.wpa
+++ b/src/wpa/install.wpa
@@ -8,5 +8,5 @@ cd $SCRIPT_DIR
 
 mkdir -p ../../build/home/yi-hack-v5/wpa/
 
-rsync -a ./_install/usr/local/sbin/ ../../build/home/yi-hack-v5/wpa/
+rsync -r ./_install/usr/local/sbin/ ../../build/home/yi-hack-v5/wpa/
 cp sysroot/lib/libcrypto.so.1.1 ../../build/home/yi-hack-v5/wpa/

From 22a33877180e90a3c5a924817ea40671e151083b Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Mon, 20 Nov 2023 21:04:27 +0000
Subject: [PATCH 38/81] [Pre-Release] 0.4.1c  Changes to be committed: 
 modified:   ../VERSION

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 719a94a..6af9b7a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.1b
+0.4.1c

From dee720d7ab7a565592c20c0fd6a26ccb1c8d5150 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Tue, 21 Nov 2023 08:18:54 +0000
Subject: [PATCH 39/81] [Fix] wpa_supplicant backup process  Changes to be
 committed: 	modified:  
 ../src/static/static/home/yi-hack-v5/script/system.sh

---
 src/static/static/home/yi-hack-v5/script/system.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/static/static/home/yi-hack-v5/script/system.sh b/src/static/static/home/yi-hack-v5/script/system.sh
index ea003db..8535ea7 100755
--- a/src/static/static/home/yi-hack-v5/script/system.sh
+++ b/src/static/static/home/yi-hack-v5/script/system.sh
@@ -30,17 +30,19 @@ export PATH=/usr/bin:/usr/sbin:/bin:/sbin:/home/base/tools:/home/yi-hack-v5/bin:
 
 # Upgrade wpa_supplicant modules
 ifconfig wlan0 up
-if [ -f /tmp/sd/yi-hack-v5/wpa/wpa_supplicant ]; then
+if [ -f $YI_HACK_PREFIX/wpa/wpa_supplicant ]; then
     echo "---backing up wpa---"
-    cp /home/base/tools/wpa_supplicant /tmp/sd/yi-hack-v5/wpa/wpa_supplicant_backup
-    cp /home/base/tools/wpa_cli /tmp/sd/yi-hack-v5/wpa/wpa_cli_backup
-    cp /home/base/tools/wpa_passphrase /tmp/sd/yi-hack-v5/wpa/wpa_passphrase_backup
+    cp /home/base/tools/wpa_supplicant $YI_HACK_PREFIX/wpa/wpa_supplicant_backup
+    cp /home/base/tools/wpa_cli $YI_HACK_PREFIX/wpa/wpa_cli_backup
+    cp /home/base/tools/wpa_passphrase $YI_HACK_PREFIX/wpa/wpa_passphrase_backup
     killall watch_process
     killall wpa*
     mv /tmp/sd/yi-hack-v5/wpa/*.so* /home/lib/
-    mv /tmp/sd/yi-hack-v5/wpa/wpa_* /home/base/tools/
+    mv /tmp/sd/yi-hack-v5/wpa/wpa_supplicant /home/base/tools/
+    mv /tmp/sd/yi-hack-v5/wpa/wpa_cli /home/base/tools/
+    mv /tmp/sd/yi-hack-v5/wpa/wpa_passphrase /home/base/tools/
     reboot
-	echo "---wpa upgrade done---"
+    echo "---wpa upgrade done---"
 else
 	echo "---no wpa upgrade---"
 fi

From b55c5cadc363e8a244fc7d4934bdbd5a0b820f40 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Tue, 21 Nov 2023 20:24:33 +0000
Subject: [PATCH 40/81] [-] Removed duplicated snapshot settings - Thanks
 @MichlW  Changes to be committed: 	modified:   system.conf

---
 src/static/static/home/yi-hack-v5/etc/system.conf | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/static/static/home/yi-hack-v5/etc/system.conf b/src/static/static/home/yi-hack-v5/etc/system.conf
index d737fee..3f4e16a 100644
--- a/src/static/static/home/yi-hack-v5/etc/system.conf
+++ b/src/static/static/home/yi-hack-v5/etc/system.conf
@@ -14,8 +14,6 @@ ONVIF_WSDD=no
 ONVIF_PROFILE=high
 ONVIF_NETIF=wlan0
 TIME_OSD=no
-SNAPSHOT=yes
-SNAPSHOT_LOW=no
 NTPD=no
 NTP_SERVER=pool.ntp.org
 PROXYCHAINSNG=no

From f9904366862eea01df423f9911466b0d9e0434b2 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Wed, 22 Nov 2023 11:06:15 +0000
Subject: [PATCH 41/81] [Fix] cloudAPI execution and app pairing  Changes to be
 committed: 	modified:   src/static/static/home/yi-hack-v5/script/cloudAPI

---
 src/static/static/home/yi-hack-v5/script/cloudAPI | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/static/static/home/yi-hack-v5/script/cloudAPI b/src/static/static/home/yi-hack-v5/script/cloudAPI
index 7461162..39148aa 100755
--- a/src/static/static/home/yi-hack-v5/script/cloudAPI
+++ b/src/static/static/home/yi-hack-v5/script/cloudAPI
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# 0.4.1d
+
 ulimit -s 1024
 export LD_LIBRARY_PATH=/home/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=/tmp/sd/yi-hack-v5/lib:$LD_LIBRARY_PATH
@@ -28,8 +30,11 @@ if [[ $(get_config DISABLE_CLOUD) == "yes" ]] ; then
         cd /home/app
         ./cloudAPI_fake "$@"
 else
-    if [[ $(get_config PROXYCHAINSNG) == "yes" ]] ; then
-        $YI_HACK_V5_PREFIX/bin/proxychains4 ./home/app/cloudAPI_real "$@"
+    if [ "$4" == "https://api.xiaoyi.com/v4/ipc/check_did" ]; then
+        echo '{"allow":true,"code":"20000"}'
+    elif [[ $(get_config PROXYCHAINSNG) == "yes" ]] ; then
+        cd /home/app
+        $YI_HACK_V5_PREFIX/bin/proxychains4 ./cloudAPI_real "$@"
     else
         cd /home/app
         ./cloudAPI_real "$@"

From f282f6edf5b13c30ad29998ddc59af021bcc8362 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Wed, 22 Nov 2023 11:10:19 +0000
Subject: [PATCH 42/81] [+] Update cloudAPI if necessary  Changes to be
 committed: 	modified:   src/static/static/home/yi-hack-v5/script/system.sh

---
 src/static/static/home/yi-hack-v5/script/system.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/static/static/home/yi-hack-v5/script/system.sh b/src/static/static/home/yi-hack-v5/script/system.sh
index 8535ea7..9f8550f 100755
--- a/src/static/static/home/yi-hack-v5/script/system.sh
+++ b/src/static/static/home/yi-hack-v5/script/system.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# 0.4.1c
+# 0.4.1d
 
 CONF_FILE="etc/system.conf"
 
@@ -91,6 +91,11 @@ if [[ "$(grep -m 3 -n '' /home/app/cloudAPI_fake | tail -n 1 | cut -d ':' -f 2 |
   cp -f $YI_HACK_PREFIX/script/cloudAPI_fake /home/app/
 fi
 
+# Update cloudAPI if necessary
+if [[ "$(grep -m 3 -n '' /home/app/cloudAPI | tail -n 1 | cut -d ':' -f 2 | cut -c 3-)" != "$(grep -m 3 -n '' $YI_HACK_PREFIX/script/cloudAPI | tail -n 1 | cut -d ':' -f 2 | cut -c 3-)" ]]; then
+  cp -f $YI_HACK_PREFIX/script/cloudAPI /home/app/
+fi
+
 # Manual Wi-Fi config
 if [ -f /tmp/sd/recover/configure_wifi.cfg ]; then
 	mv /tmp/sd/recover/configure_wifi.cfg /tmp/configure_wifi.cfg

From 4b7da2832ea50006ab313e9a2a90ca0a154bf501 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Wed, 22 Nov 2023 11:11:27 +0000
Subject: [PATCH 43/81] [Pre-Release] 0.4.1d  Changes to be committed: 
 modified:   VERSION

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 6af9b7a..485ed42 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.1c
+0.4.1d

From 536af1319047ce591023eed60861df659ca9b0a9 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Tue, 23 Jan 2024 18:16:21 +0000
Subject: [PATCH 44/81] [Amend] Busybox  Changes to be committed: 
 modified:   .gitmodules 	deleted:    src/busybox/busybox 	new
 file:   src/busybox/cleanup.busybox 	new file:   src/busybox/config.busybox

---
 .gitmodules                 |  4 ----
 src/busybox/busybox         |  1 -
 src/busybox/cleanup.busybox | 10 ++++++++++
 src/busybox/config.busybox  |  8 ++++++++
 4 files changed, 18 insertions(+), 5 deletions(-)
 delete mode 160000 src/busybox/busybox
 create mode 100755 src/busybox/cleanup.busybox
 create mode 100755 src/busybox/config.busybox

diff --git a/.gitmodules b/.gitmodules
index c2afc4d..1bd3937 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,10 +6,6 @@
 	path = src/uClibc/uClibc
 	url = https://github.com/kraj/uClibc.git
 	ignore = dirty
-[submodule "src/busybox/busybox"]
-	path = src/busybox/busybox
-	url = https://github.com/mirror/busybox.git
-	ignore = dirty
 [submodule "src/proxychains-ng/proxychains-ng"]
 	path = src/proxychains-ng/proxychains-ng
 	url = https://github.com/rofl0r/proxychains-ng.git
diff --git a/src/busybox/busybox b/src/busybox/busybox
deleted file mode 160000
index bd75474..0000000
--- a/src/busybox/busybox
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bd754746394a382e04d116df02547f61b2026da9
diff --git a/src/busybox/cleanup.busybox b/src/busybox/cleanup.busybox
new file mode 100755
index 0000000..9301cbb
--- /dev/null
+++ b/src/busybox/cleanup.busybox
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+cd $SCRIPT_DIR
+
+source config.busybox
+
+rm -rf "${BUILD_FOLDER}"
+
+make clean
diff --git a/src/busybox/config.busybox b/src/busybox/config.busybox
new file mode 100755
index 0000000..04dfd98
--- /dev/null
+++ b/src/busybox/config.busybox
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+VERSION="1.36.1"
+#MAIN_URL=https://github.com/mirror/busybox/archive/refs/tags/${VERSION}.tar.gz
+MAIN_URL=https://busybox.net/downloads/busybox-${VERSION}.tar.bz2
+PACKAGE="busybox-${VERSION}"
+ARCHIVE="${PACKAGE}.tar.bz2"
+BUILD_FOLDER="busybox-${VERSION}"

From 457be5ca264b0c2721ce856dcd065ef31803d5a2 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Tue, 23 Jan 2024 18:39:23 +0000
Subject: [PATCH 45/81] [+] Busybox 1.36.1  Changes to be committed: 
 modified:   src/busybox/.config 	modified:  
 src/busybox/compile.busybox 	modified:   src/busybox/init.busybox

---
 src/busybox/.config         | 118 ++++++++++++++++++++++++------------
 src/busybox/compile.busybox |   5 +-
 src/busybox/init.busybox    |  18 +++++-
 3 files changed, 97 insertions(+), 44 deletions(-)

diff --git a/src/busybox/.config b/src/busybox/.config
index dbf9c0a..62c261c 100644
--- a/src/busybox/.config
+++ b/src/busybox/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.31.1
-# Thu Apr 29 20:02:02 2021
+# Busybox version: 1.36.1
+# Tue Jan 23 18:38:08 2024
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -36,7 +36,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 # CONFIG_FEATURE_CLEAN_UP is not set
 CONFIG_FEATURE_SYSLOG_INFO=y
 CONFIG_FEATURE_SYSLOG=y
-CONFIG_PLATFORM_LINUX=y
 
 #
 # Build Options
@@ -55,6 +54,7 @@ CONFIG_EXTRA_LDFLAGS=""
 CONFIG_EXTRA_LDLIBS=""
 # CONFIG_USE_PORTABLE_CODE is not set
 # CONFIG_STACK_OPTIMIZATION_386 is not set
+CONFIG_STATIC_LIBGCC=y
 
 #
 # Installation Options ("make install" behavior)
@@ -76,6 +76,7 @@ CONFIG_PREFIX="../_install"
 # CONFIG_DEBUG_SANITIZE is not set
 # CONFIG_UNIT_TEST is not set
 # CONFIG_WERROR is not set
+# CONFIG_WARN_SIMPLE_MSG is not set
 CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
@@ -92,10 +93,16 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=1
+CONFIG_SHA1_SMALL=3
+CONFIG_SHA1_HWACCEL=y
+CONFIG_SHA256_HWACCEL=y
 CONFIG_SHA3_SMALL=1
-CONFIG_FEATURE_FAST_TOP=y
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-# CONFIG_FEATURE_ETC_SERVICES is not set
+CONFIG_FEATURE_NON_POSIX_CP=y
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_USE_SENDFILE=y
+CONFIG_FEATURE_COPYBUF_KB=4
+# CONFIG_MONOTONIC_SYSCALL is not set
+CONFIG_IOCTL_HEX2STR_ERROR=y
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
@@ -119,14 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
 # CONFIG_UNICODE_BIDI_SUPPORT is not set
 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
 # CONFIG_UNICODE_PRESERVE_BROKEN is not set
-CONFIG_FEATURE_NON_POSIX_CP=y
-# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
-CONFIG_FEATURE_USE_SENDFILE=y
-CONFIG_FEATURE_COPYBUF_KB=4
-CONFIG_FEATURE_SKIP_ROOTFS=y
-# CONFIG_MONOTONIC_SYSCALL is not set
-CONFIG_IOCTL_HEX2STR_ERROR=y
-CONFIG_FEATURE_HWIB=y
+# CONFIG_LOOP_CONFIGURE is not set
+# CONFIG_NO_LOOP_CONFIGURE is not set
+CONFIG_TRY_LOOP_CONFIGURE=y
 
 #
 # Applets
@@ -161,6 +163,8 @@ CONFIG_FEATURE_BZIP2_DECOMPRESS=y
 # CONFIG_CPIO is not set
 # CONFIG_FEATURE_CPIO_O is not set
 # CONFIG_FEATURE_CPIO_P is not set
+# CONFIG_FEATURE_CPIO_IGNORE_DEVNO is not set
+# CONFIG_FEATURE_CPIO_RENUMBER_INODES is not set
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 CONFIG_GZIP=y
@@ -196,6 +200,22 @@ CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
 #
 # Coreutils
 #
+CONFIG_FEATURE_VERBOSE=y
+
+#
+# Common options for date and touch
+#
+# CONFIG_FEATURE_TIMEZONE is not set
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
 CONFIG_BASENAME=y
 CONFIG_CAT=y
 CONFIG_FEATURE_CATN=y
@@ -206,11 +226,13 @@ CONFIG_CHOWN=y
 CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
 # CONFIG_CHROOT is not set
 # CONFIG_CKSUM is not set
+# CONFIG_CRC32 is not set
 # CONFIG_COMM is not set
 CONFIG_CP=y
 CONFIG_FEATURE_CP_LONG_OPTIONS=y
 CONFIG_FEATURE_CP_REFLINK=y
 CONFIG_CUT=y
+CONFIG_FEATURE_CUT_REGEX=y
 CONFIG_DATE=y
 CONFIG_FEATURE_DATE_ISOFMT=y
 # CONFIG_FEATURE_DATE_NANO is not set
@@ -222,6 +244,7 @@ CONFIG_FEATURE_DD_IBS_OBS=y
 CONFIG_FEATURE_DD_STATUS=y
 CONFIG_DF=y
 CONFIG_FEATURE_DF_FANCY=y
+CONFIG_FEATURE_SKIP_ROOTFS=y
 CONFIG_DIRNAME=y
 # CONFIG_DOS2UNIX is not set
 # CONFIG_UNIX2DOS is not set
@@ -315,13 +338,13 @@ CONFIG_TEST2=y
 # CONFIG_FEATURE_TEST_64 is not set
 # CONFIG_TIMEOUT is not set
 CONFIG_TOUCH=y
-# CONFIG_FEATURE_TOUCH_NODEREF is not set
 # CONFIG_FEATURE_TOUCH_SUSV3 is not set
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
 # CONFIG_TRUE is not set
 # CONFIG_TRUNCATE is not set
+# CONFIG_TSORT is not set
 # CONFIG_TTY is not set
 # CONFIG_UNAME is not set
 CONFIG_UNAME_OSNAME=""
@@ -330,31 +353,17 @@ CONFIG_BB_ARCH=y
 # CONFIG_UNLINK is not set
 CONFIG_USLEEP=y
 # CONFIG_UUDECODE is not set
+# CONFIG_BASE32 is not set
 CONFIG_BASE64=y
 # CONFIG_UUENCODE is not set
 # CONFIG_WC is not set
 # CONFIG_FEATURE_WC_LARGE is not set
-# CONFIG_WHOAMI is not set
 # CONFIG_WHO is not set
 # CONFIG_W is not set
 # CONFIG_USERS is not set
+# CONFIG_WHOAMI is not set
 # CONFIG_YES is not set
 
-#
-# Common options
-#
-CONFIG_FEATURE_VERBOSE=y
-
-#
-# Common options for cp and mv
-#
-CONFIG_FEATURE_PRESERVE_HARDLINKS=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
 #
 # Console Utilities
 #
@@ -418,6 +427,7 @@ CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=4096
 # CONFIG_FEATURE_VI_8BIT is not set
 CONFIG_FEATURE_VI_COLON=y
+# CONFIG_FEATURE_VI_COLON_EXPAND is not set
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
 # CONFIG_FEATURE_VI_REGEX_SEARCH is not set
@@ -431,6 +441,7 @@ CONFIG_FEATURE_VI_ASK_TERMINAL=y
 CONFIG_FEATURE_VI_UNDO=y
 CONFIG_FEATURE_VI_UNDO_QUEUE=y
 CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
+# CONFIG_FEATURE_VI_VERBOSE_STATUS is not set
 CONFIG_FEATURE_ALLOW_EXEC=y
 
 #
@@ -439,7 +450,11 @@ CONFIG_FEATURE_ALLOW_EXEC=y
 CONFIG_FIND=y
 CONFIG_FEATURE_FIND_PRINT0=y
 CONFIG_FEATURE_FIND_MTIME=y
+# CONFIG_FEATURE_FIND_ATIME is not set
+# CONFIG_FEATURE_FIND_CTIME is not set
 CONFIG_FEATURE_FIND_MMIN=y
+# CONFIG_FEATURE_FIND_AMIN is not set
+# CONFIG_FEATURE_FIND_CMIN is not set
 CONFIG_FEATURE_FIND_PERM=y
 CONFIG_FEATURE_FIND_TYPE=y
 CONFIG_FEATURE_FIND_EXECUTABLE=y
@@ -447,6 +462,7 @@ CONFIG_FEATURE_FIND_XDEV=y
 CONFIG_FEATURE_FIND_MAXDEPTH=y
 CONFIG_FEATURE_FIND_NEWER=y
 CONFIG_FEATURE_FIND_INUM=y
+# CONFIG_FEATURE_FIND_SAMEFILE is not set
 CONFIG_FEATURE_FIND_EXEC=y
 CONFIG_FEATURE_FIND_EXEC_PLUS=y
 CONFIG_FEATURE_FIND_USER=y
@@ -458,6 +474,7 @@ CONFIG_FEATURE_FIND_SIZE=y
 CONFIG_FEATURE_FIND_PRUNE=y
 CONFIG_FEATURE_FIND_QUIT=y
 CONFIG_FEATURE_FIND_DELETE=y
+# CONFIG_FEATURE_FIND_EMPTY is not set
 CONFIG_FEATURE_FIND_PATH=y
 CONFIG_FEATURE_FIND_REGEX=y
 # CONFIG_FEATURE_FIND_CONTEXT is not set
@@ -507,10 +524,10 @@ CONFIG_USE_BB_PWD_GRP=y
 CONFIG_USE_BB_SHADOW=y
 CONFIG_USE_BB_CRYPT=y
 CONFIG_USE_BB_CRYPT_SHA=y
-CONFIG_ADDGROUP=y
-CONFIG_FEATURE_ADDUSER_TO_GROUP=y
 CONFIG_ADD_SHELL=y
 CONFIG_REMOVE_SHELL=y
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
 CONFIG_ADDUSER=y
 # CONFIG_FEATURE_CHECK_NAMES is not set
 CONFIG_LAST_ID=60000
@@ -617,7 +634,6 @@ CONFIG_FLOCK=y
 # CONFIG_GETOPT is not set
 # CONFIG_FEATURE_GETOPT_LONG is not set
 CONFIG_HEXDUMP=y
-CONFIG_FEATURE_HEXDUMP_REVERSE=y
 CONFIG_HD=y
 # CONFIG_XXD is not set
 # CONFIG_HWCLOCK is not set
@@ -688,6 +704,7 @@ CONFIG_SWAPON=y
 # CONFIG_SWITCH_ROOT is not set
 # CONFIG_TASKSET is not set
 # CONFIG_FEATURE_TASKSET_FANCY is not set
+# CONFIG_FEATURE_TASKSET_CPULIST is not set
 # CONFIG_UEVENT is not set
 CONFIG_UMOUNT=y
 CONFIG_FEATURE_UMOUNT_ALL=y
@@ -708,6 +725,7 @@ CONFIG_VOLUMEID=y
 # CONFIG_FEATURE_VOLUMEID_BCACHE is not set
 CONFIG_FEATURE_VOLUMEID_BTRFS=y
 CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+# CONFIG_FEATURE_VOLUMEID_EROFS is not set
 CONFIG_FEATURE_VOLUMEID_EXFAT=y
 CONFIG_FEATURE_VOLUMEID_EXT=y
 # CONFIG_FEATURE_VOLUMEID_F2FS is not set
@@ -735,6 +753,7 @@ CONFIG_FEATURE_VOLUMEID_XFS=y
 # Miscellaneous Utilities
 #
 # CONFIG_ADJTIMEX is not set
+# CONFIG_ASCII is not set
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
 CONFIG_BC=y
@@ -768,10 +787,10 @@ CONFIG_CRONTAB=y
 # CONFIG_FEATURE_DEVFS is not set
 # CONFIG_DEVMEM is not set
 # CONFIG_FBSPLASH is not set
-CONFIG_FLASHCP=y
 CONFIG_FLASH_ERASEALL=y
 # CONFIG_FLASH_LOCK is not set
 # CONFIG_FLASH_UNLOCK is not set
+CONFIG_FLASHCP=y
 CONFIG_HDPARM=y
 CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
 CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
@@ -805,6 +824,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
 # CONFIG_MAN is not set
 # CONFIG_MICROCOM is not set
+# CONFIG_MIM is not set
 # CONFIG_MT is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
@@ -814,21 +834,24 @@ CONFIG_FEATURE_LESS_MAXLINES=0
 # CONFIG_RFKILL is not set
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
+# CONFIG_SEEDRNG is not set
 CONFIG_SETFATTR=y
 # CONFIG_SETSERIAL is not set
 # CONFIG_STRINGS is not set
 # CONFIG_TIME is not set
+# CONFIG_TREE is not set
 CONFIG_TS=y
 # CONFIG_TTYSIZE is not set
-# CONFIG_UBIRENAME is not set
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
 # CONFIG_UBIMKVOL is not set
 # CONFIG_UBIRMVOL is not set
 # CONFIG_UBIRSVOL is not set
 # CONFIG_UBIUPDATEVOL is not set
+# CONFIG_UBIRENAME is not set
 # CONFIG_VOLNAME is not set
 # CONFIG_WATCHDOG is not set
+# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set
 
 #
 # Networking Utilities
@@ -837,6 +860,9 @@ CONFIG_FEATURE_IPV6=y
 # CONFIG_FEATURE_UNIX_LOCAL is not set
 CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
 # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+# CONFIG_FEATURE_ETC_SERVICES is not set
+CONFIG_FEATURE_HWIB=y
 # CONFIG_FEATURE_TLS_SHA1 is not set
 CONFIG_ARP=y
 CONFIG_ARPING=y
@@ -855,6 +881,7 @@ CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
 CONFIG_HOSTNAME=y
 # CONFIG_DNSDOMAINNAME is not set
 CONFIG_HTTPD=y
+CONFIG_FEATURE_HTTPD_PORT_DEFAULT=8080
 CONFIG_FEATURE_HTTPD_RANGES=y
 # CONFIG_FEATURE_HTTPD_SETUID is not set
 CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
@@ -866,6 +893,10 @@ CONFIG_FEATURE_HTTPD_CGI=y
 # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
 # CONFIG_FEATURE_HTTPD_PROXY is not set
 CONFIG_FEATURE_HTTPD_GZIP=y
+# CONFIG_FEATURE_HTTPD_ETAG is not set
+# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set
+# CONFIG_FEATURE_HTTPD_DATE is not set
+# CONFIG_FEATURE_HTTPD_ACL_IP is not set
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
 CONFIG_FEATURE_IFCONFIG_SLIP=y
@@ -943,6 +974,7 @@ CONFIG_TCPSVD=y
 # CONFIG_FEATURE_TELNET_WIDTH is not set
 CONFIG_TELNETD=y
 CONFIG_FEATURE_TELNETD_STANDALONE=y
+CONFIG_FEATURE_TELNETD_PORT_DEFAULT=23
 CONFIG_FEATURE_TELNETD_INETD_WAIT=y
 # CONFIG_TFTP is not set
 # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
@@ -963,6 +995,7 @@ CONFIG_TLS=y
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_FTP=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 CONFIG_FEATURE_WGET_TIMEOUT=y
 CONFIG_FEATURE_WGET_HTTPS=y
@@ -979,6 +1012,7 @@ CONFIG_UDHCPC=y
 CONFIG_FEATURE_UDHCPC_ARPING=y
 CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
 CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC6_DEFAULT_SCRIPT=""
 # CONFIG_UDHCPC6 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
@@ -988,6 +1022,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 #
 # Common options for DHCP applets
 #
+CONFIG_UDHCPC_DEFAULT_INTERFACE="wlan0"
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=9
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
@@ -1005,17 +1040,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
 #
 # Mail Utilities
 #
+CONFIG_FEATURE_MIME_CHARSET="us-ascii"
 # CONFIG_MAKEMIME is not set
 # CONFIG_POPMAILDIR is not set
 # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
 # CONFIG_REFORMIME is not set
 # CONFIG_FEATURE_REFORMIME_COMPAT is not set
 CONFIG_SENDMAIL=y
-CONFIG_FEATURE_MIME_CHARSET="us-ascii"
 
 #
 # Process Utilities
 #
+CONFIG_FEATURE_FAST_TOP=y
+CONFIG_FEATURE_SHOW_THREADS=y
 CONFIG_FREE=y
 # CONFIG_FUSER is not set
 CONFIG_IOSTAT=y
@@ -1054,7 +1091,6 @@ CONFIG_FEATURE_TOPMEM=y
 CONFIG_UPTIME=y
 # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
 # CONFIG_WATCH is not set
-CONFIG_FEATURE_SHOW_THREADS=y
 
 #
 # Runit Utilities
@@ -1095,6 +1131,7 @@ CONFIG_SH_IS_ASH=y
 # CONFIG_BASH_IS_ASH is not set
 # CONFIG_BASH_IS_HUSH is not set
 CONFIG_BASH_IS_NONE=y
+CONFIG_SHELL_ASH=y
 CONFIG_ASH=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 CONFIG_ASH_INTERNAL_GLOB=y
@@ -1110,15 +1147,17 @@ CONFIG_ASH_EXPAND_PRMT=y
 CONFIG_ASH_ECHO=y
 CONFIG_ASH_PRINTF=y
 CONFIG_ASH_TEST=y
+# CONFIG_ASH_SLEEP is not set
 CONFIG_ASH_HELP=y
 CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_CMDCMD=y
 CONFIG_CTTYHACK=y
 # CONFIG_HUSH is not set
+# CONFIG_SHELL_HUSH is not set
 # CONFIG_HUSH_BASH_COMPAT is not set
 # CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_LINENO_VAR is not set
 # CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
+# CONFIG_HUSH_LINENO_VAR is not set
 # CONFIG_HUSH_INTERACTIVE is not set
 # CONFIG_HUSH_SAVEHISTORY is not set
 # CONFIG_HUSH_JOB is not set
@@ -1177,6 +1216,7 @@ CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y
 # CONFIG_FEATURE_REMOTE_LOG is not set
 # CONFIG_FEATURE_SYSLOGD_DUP is not set
 # CONFIG_FEATURE_SYSLOGD_CFG is not set
+# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
 # CONFIG_FEATURE_IPC_SYSLOG is not set
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
diff --git a/src/busybox/compile.busybox b/src/busybox/compile.busybox
index 6cd2340..807beaa 100755
--- a/src/busybox/compile.busybox
+++ b/src/busybox/compile.busybox
@@ -3,8 +3,9 @@
 SCRIPT_DIR=$(cd `dirname $0` && pwd)
 cd $SCRIPT_DIR
 
-cd busybox
+source config.busybox
+
+cd "${BUILD_FOLDER}"
 
 make -j$(nproc) ARCH=arm || exit 1
 make install || exit 1
-
diff --git a/src/busybox/init.busybox b/src/busybox/init.busybox
index 5d8fe89..64ee90e 100755
--- a/src/busybox/init.busybox
+++ b/src/busybox/init.busybox
@@ -5,8 +5,20 @@ cd $SCRIPT_DIR
 
 rm -rf ./_install
 
-cd busybox 
-git reset --hard || exit 1
+source config.busybox
 
-cp ../.config ./ || exit 1
+rm -rf ./_install
+
+if [ ! -f "${ARCHIVE}" ]; then
+    wget "${MAIN_URL}"
+fi
+
+tar xvf "${ARCHIVE}"
 
+cd "${BUILD_FOLDER}"
+
+#patch -p1 < ../gzdef.patch
+#patch -p1 < ../onvif.patch
+#patch -p1 < ../auth.patch
+
+cp ../.config ./ || exit 1

From 405862ef954b617aa9285f0d4ed2a6db0f29ebca Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Wed, 24 Jan 2024 20:54:24 +0100
Subject: [PATCH 46/81] Add ptz functions to ipc_cmd

---
 src/ipc_cmd/ipc_cmd/Makefile        |   7 +-
 src/ipc_cmd/ipc_cmd/ipc_cmd.c       | 217 ++++++++++++++++++++++++++--
 src/ipc_cmd/ipc_cmd/ipc_cmd.h       |  13 +-
 src/ipc_cmd/ipc_cmd/ipc_multiplex.c |  12 +-
 src/ipc_cmd/ipc_cmd/ipc_notify.c    |   4 +-
 src/ipc_cmd/ipc_cmd/ptz.c           | 111 ++++++++++++++
 src/ipc_cmd/ipc_cmd/ptz.h           |   9 ++
 7 files changed, 346 insertions(+), 27 deletions(-)
 create mode 100644 src/ipc_cmd/ipc_cmd/ptz.c
 create mode 100644 src/ipc_cmd/ipc_cmd/ptz.h

diff --git a/src/ipc_cmd/ipc_cmd/Makefile b/src/ipc_cmd/ipc_cmd/Makefile
index 7740402..12caa7e 100644
--- a/src/ipc_cmd/ipc_cmd/Makefile
+++ b/src/ipc_cmd/ipc_cmd/Makefile
@@ -1,13 +1,16 @@
-OBJECTS_C = ipc_cmd.o
+OBJECTS_C = ipc_cmd.o ptz.o
 OBJECTS_R = ipc_read.o
 OBJECTS_N = ipc_notify.o
-LIBS = -lpthread -lrt
+LIBS = -lpthread -lrt -lm
 
 all: ipc_cmd ipc_read ipc_notify ipc_multiplex.so
 
 ipc_cmd.o: ipc_cmd.c $(HEADERS)
 	$(CC) -c $< -D_GNU_SOURCE -std=c99 -fPIC -O2 -o $@
 
+ptz.o: ptz.c $(HEADERS)
+	$(CC) -c $< -D_GNU_SOURCE -std=c99 -fPIC -O2 -o $@
+
 ipc_read.o: ipc_read.c $(HEADERS)
 	$(CC) -c $< -D_GNU_SOURCE -std=c99 -fPIC -O2 -o $@
 
diff --git a/src/ipc_cmd/ipc_cmd/ipc_cmd.c b/src/ipc_cmd/ipc_cmd/ipc_cmd.c
index 9072bf8..3d23c01 100644
--- a/src/ipc_cmd/ipc_cmd/ipc_cmd.c
+++ b/src/ipc_cmd/ipc_cmd/ipc_cmd.c
@@ -20,8 +20,10 @@
  */
 
 #include "ipc_cmd.h"
+#include "ptz.h"
 #include "getopt.h"
 #include "signal.h"
+#include "math.h"
 
 mqd_t ipc_mq;
 
@@ -56,7 +58,7 @@ void ipc_stop()
 
 void print_usage(char *progname)
 {
-    fprintf(stderr, "\nUsage: %s [t ON/OFF] [-s SENS] [-l LED] [-v WHEN] [-i IR] [-r ROTATE] [-1] [-a AIHUMANDETECTION] [-E AIVEHICLEDETECTION] [-N AIANIMALDETECTION] [-O AIMOTIONDETECTION] [-c FACEDETECTION] [-o MOTIONTRACKING] [-I MIC] [-b SOUNDDETECTION] [-B BABYCRYING] [-n SOUNDSENSITIVITY] [-m MOVE] [-p NUM] [-P] [-R NUM] [-C MODE] [-f FILE] [-S] [-T] [-d]\n\n", progname);
+    fprintf(stderr, "\nUsage: %s [t ON/OFF] [-s SENS] [-l LED] [-v WHEN] [-i IR] [-r ROTATE] [-1] [-a AIHUMANDETECTION] [-E AIVEHICLEDETECTION] [-N AIANIMALDETECTION] [-O AIMOTIONDETECTION] [-c FACEDETECTION] [-o MOTIONTRACKING] [-I MIC] [-b SOUNDDETECTION] [-B BABYCRYING] [-n SOUNDSENSITIVITY] [-m MOVE] [-g] [-j ABS_POSITION] [-J REL_POSITION] [-p NUM] [-P NAME] [-R NUM] [-C MODE] [-f FILE] [-S TIME] [-T] [-d]\n\n", progname);
     fprintf(stderr, "\t-t ON/OFF, --switch ON/OFF\n");
     fprintf(stderr, "\t\tswitch ON or OFF the cam\n");
     fprintf(stderr, "\t-s SENS, --sensitivity SENS\n");
@@ -93,10 +95,18 @@ void print_usage(char *progname)
     fprintf(stderr, "\t\tset Sound Detection Sensitivity: 30 - 90\n");
     fprintf(stderr, "\t-m MOVE, --move MOVE\n");
     fprintf(stderr, "\t\tsend PTZ command: RIGHT, LEFT, DOWN, UP or STOP\n");
+    fprintf(stderr, "\t-g, --get-ptz\n");
+    fprintf(stderr, "\t\tget PTZ position\n");
+    fprintf(stderr, "\t-j ABS_POSITION, --jump-abs ABS_POSITION\n");
+    fprintf(stderr, "\t\tmove PTZ to ABS_POSITION (x,y) in degrees (example -j 500,500)\n");
+    fprintf(stderr, "\t-J REL_POSITION, --jump-rel REL_POSITION\n");
+    fprintf(stderr, "\t\tmove PTZ to REL_POSITION (x,y) in degrees (example -J 500,500)\n");
     fprintf(stderr, "\t-p NUM, --preset NUM\n");
-    fprintf(stderr, "\t\tsend PTZ go to preset command: NUM = [0..7]\n");
-    fprintf(stderr, "\t-P, --add_preset\n");
-    fprintf(stderr, "\t\tadd PTZ preset in the first available position\n");
+    fprintf(stderr, "\t\tsend PTZ go to preset command: TOKEN = [0..7]\n");
+    fprintf(stderr, "\t-P NAME, --add_preset NAME\n");
+    fprintf(stderr, "\t\tadd PTZ preset with name NAME in the first available position\n");
+    fprintf(stderr, "\t-H, --set_home_position\n");
+    fprintf(stderr, "\t\tset home position (preset 0 for Yi cam)\n");
     fprintf(stderr, "\t-R NUM, --remove_preset NUM\n");
     fprintf(stderr, "\t\tremove PTZ preset: NUM = [0..7] or \"all\"\n");
     fprintf(stderr, "\t-C MODE, --cruise MODE\n");
@@ -137,8 +147,14 @@ int main(int argc, char ** argv)
     int babycrying = NONE;
     int soundsensitivity = NONE;
     int move = NONE;
+    int get_pos = NONE;
+    int jump_abs = NONE;
+    int jump_rel = NONE;
+    char jump_msg[24];
+    double x, y;
     int preset = NONE;
     int add_preset = NONE;
+    int set_home_position = NONE;
     int remove_preset = NONE;
     int cruise = NONE;
     int debug = 0;
@@ -176,8 +192,12 @@ int main(int argc, char ** argv)
             {"soundsensitivity",  required_argument, 0, 'n'},
             {"move",  required_argument, 0, 'm'},
             {"move-reverse",  required_argument, 0, 'M'},
+            {"get-pos", no_argument, 0, 'g'},
+            {"jump-abs", required_argument, 0, 'j'},
+            {"jump-rel", required_argument, 0, 'J'},
             {"preset",  required_argument, 0, 'p'},
-            {"add_preset",  no_argument, 0, 'P'},
+            {"add_preset",  required_argument, 0, 'P'},
+            {"set_home_position",  no_argument, 0, 'H'},
             {"remove_preset",  required_argument, 0, 'R'},
             {"cruise",  required_argument, 0, 'C'},
             {"file", required_argument, 0, 'f'},
@@ -191,7 +211,7 @@ int main(int argc, char ** argv)
         /* getopt_long stores the option index here. */
         int option_index = 0;
 
-        c = getopt_long (argc, argv, "t:s:l:v:i:r:a:E:N:O:c:o:I:b:B:n:m:M:p:PR:C:f:S:TxXdh",
+        c = getopt_long (argc, argv, "t:s:l:v:i:r:a:E:N:O:c:o:I:b:B:n:m:M:gj:J:p:P:HR:C:f:S:Txdh",
                          long_options, &option_index);
 
         /* Detect the end of the options. */
@@ -426,6 +446,42 @@ int main(int argc, char ** argv)
             }
             break;
 
+        case 'g':
+            get_pos = 1;
+            break;
+
+        case 'j':
+            jump_abs = 1;
+            if (sscanf(optarg, "%lf,%lf", &x, &y) != 2) {
+                print_usage(argv[0]);
+                exit(EXIT_FAILURE);
+            }
+            if ((x < 0.0) || (x > 360.0)) {
+                print_usage(argv[0]);
+                exit(EXIT_FAILURE);
+            }
+            if ((y < 0.0) || (y > 180.0)) {
+                print_usage(argv[0]);
+                exit(EXIT_FAILURE);
+            }
+            break;
+
+        case 'J':
+            jump_rel = 1;
+            if (sscanf(optarg, "%lf,%lf", &x, &y) != 2) {
+                print_usage(argv[0]);
+                exit(EXIT_FAILURE);
+            }
+            if ((x < -360.0) || (x > 360.0)) {
+                print_usage(argv[0]);
+                exit(EXIT_FAILURE);
+            }
+            if ((y < -180.0) || (y > 180.0)) {
+                print_usage(argv[0]);
+                exit(EXIT_FAILURE);
+            }
+            break;
+
         case 'p':
             errno = 0;    /* To distinguish success/failure after call */
             preset = strtol(optarg, &endptr, 10);
@@ -442,9 +498,14 @@ int main(int argc, char ** argv)
             break;
 
         case 'P':
+            // Ignore argument
             add_preset = 1;
             break;
 
+        case 'H':
+            set_home_position = 1;
+            break;
+
         case 'R':
             errno = 0;    /* To distinguish success/failure after call */
             if (strcasecmp("all", optarg) == 0) {
@@ -667,16 +728,104 @@ int main(int argc, char ** argv)
         mq_send(ipc_mq, IPC_SOUND_SENS_90, sizeof(IPC_SOUND_SENS_90) - 1, 0);
     }
 
-    if (move == MOVE_RIGHT) {
-        mq_send(ipc_mq, IPC_MOVE_RIGHT, sizeof(IPC_MOVE_RIGHT) - 1, 0);
-    } else if (move == MOVE_LEFT) {
-        mq_send(ipc_mq, IPC_MOVE_LEFT, sizeof(IPC_MOVE_LEFT) - 1, 0);
-    } else if (move == MOVE_DOWN) {
-        mq_send(ipc_mq, IPC_MOVE_DOWN, sizeof(IPC_MOVE_DOWN) - 1, 0);
-    } else if (move == MOVE_UP) {
-        mq_send(ipc_mq, IPC_MOVE_UP, sizeof(IPC_MOVE_UP) - 1, 0);
-    } else if (move == MOVE_STOP) {
-        mq_send(ipc_mq, IPC_MOVE_STOP, sizeof(IPC_MOVE_STOP) - 1, 0);
+    if (move != NONE) {
+        char model_suffix[16];
+        int is_ptz_value;
+
+        memset(model_suffix, '\0', sizeof(model_suffix));
+        get_model_suffix(model_suffix, sizeof(model_suffix));
+        is_ptz_value = is_ptz(model_suffix);
+
+        if (is_ptz_value == ALLWINNER_V2) {
+            move = -1 * move;
+        } else if ((is_ptz_value == ALLWINNER_V2_ALT) &&
+                ((move == MOVE_LEFT) || (move == MOVE_RIGHT))) {
+            move = -1 * move;
+        }
+
+        if (move == MOVE_RIGHT) {
+            mq_send(ipc_mq, IPC_MOVE_RIGHT, sizeof(IPC_MOVE_RIGHT) - 1, 0);
+        } else if (move == MOVE_LEFT) {
+            mq_send(ipc_mq, IPC_MOVE_LEFT, sizeof(IPC_MOVE_LEFT) - 1, 0);
+        } else if (move == MOVE_DOWN) {
+            mq_send(ipc_mq, IPC_MOVE_DOWN, sizeof(IPC_MOVE_DOWN) - 1, 0);
+        } else if (move == MOVE_UP) {
+            mq_send(ipc_mq, IPC_MOVE_UP, sizeof(IPC_MOVE_UP) - 1, 0);
+        } else if (move == MOVE_STOP) {
+            mq_send(ipc_mq, IPC_MOVE_STOP, sizeof(IPC_MOVE_STOP) - 1, 0);
+        }
+    }
+
+    if (jump_abs != NONE) {
+        double fx, fy;
+        int cur_x, cur_y;
+        int fin_x, fin_y;
+        char model_suffix[16];
+        int is_ptz_value;
+
+        memset(model_suffix, '\0', sizeof(model_suffix));
+        get_model_suffix(model_suffix, sizeof(model_suffix));
+        is_ptz_value = is_ptz(model_suffix);
+
+        if (is_ptz_value == ALLWINNER_V2_ALT) {
+            y = 180.0 - y;
+        }
+
+        if (read_ptz(&cur_x, &cur_y) != 0) {
+            fprintf(stderr, "Error reading current ptz position\n");
+            return -1;
+        }
+        fx = x * (((double) MAX_PTZ_X) / 360.0);
+        fx = round(fx);
+        fx = (fx - ((double) cur_x)) * 100.0 / 911.0 + 50.0;
+        fin_x = (int) round(fx);
+        fy = y * (((double) MAX_PTZ_Y) / 180.0);
+        fy = round(fy);
+        fy = (fy - ((double) cur_y)) * 100.0 / 694.0 + 50.0;
+        fin_y = (int) round(fy);
+
+        if (debug) fprintf(stderr, "Current x  = %d, y  = %d\n", cur_x, cur_y);
+        if (debug) fprintf(stderr, "Command xr = %d, yr = %d\n", fin_x, fin_y);
+        memcpy(jump_msg, IPC_JUMP_POSITION, sizeof(IPC_JUMP_POSITION) - 1);
+        memcpy(&jump_msg[16], &fin_x, 4);
+        memcpy(&jump_msg[20], &fin_y, 4);
+        mq_send(ipc_mq, jump_msg, sizeof(IPC_JUMP_POSITION) - 1, 0);
+    }
+
+    if (jump_rel != NONE) {
+        double fx, fy;
+        int cur_x, cur_y;
+        int fin_x, fin_y;
+        char model_suffix[16];
+        int is_ptz_value;
+
+        memset(model_suffix, '\0', sizeof(model_suffix));
+        get_model_suffix(model_suffix, sizeof(model_suffix));
+        is_ptz_value = is_ptz(model_suffix);
+
+        if (is_ptz_value == ALLWINNER_V2_ALT) {
+            y = -1.0 * y;
+        }
+
+        if (read_ptz(&cur_x, &cur_y) != 0) {
+            fprintf(stderr, "Error reading current ptz position\n");
+            return -1;
+        }
+        fx = x * (((double) MAX_PTZ_X) / 360.0);
+        fx = round(fx);
+        fx = fx * 100.0 / 911.0 + 50.0;
+        fin_x = (int) round(fx);
+        fy = y * (((double) MAX_PTZ_Y) / 180.0);
+        fy = round(fy);
+        fy = fy * 100.0 / 694.0 + 50.0;
+        fin_y = (int) round(fy);
+
+        if (debug) fprintf(stderr, "Current x  = %d, y  = %d\n", cur_x, cur_y);
+        if (debug) fprintf(stderr, "Command xr = %d, yr = %d\n", fin_x, fin_y);
+        memcpy(jump_msg, IPC_JUMP_POSITION, sizeof(IPC_JUMP_POSITION) - 1);
+        memcpy(&jump_msg[16], &fin_x, 4);
+        memcpy(&jump_msg[20], &fin_y, 4);
+        mq_send(ipc_mq, jump_msg, sizeof(IPC_JUMP_POSITION) - 1, 0);
     }
 
     if (preset != NONE) {
@@ -686,6 +835,42 @@ int main(int argc, char ** argv)
     }
 
     if (add_preset != NONE) {
+        // Ignore name because Yi doesn't support it
+        mq_send(ipc_mq, IPC_ADD_PRESET, sizeof(IPC_ADD_PRESET) - 1, 0);
+    }
+
+    if (get_pos != NONE) {
+        double fx, fy;
+        int cur_x, cur_y;
+        char model_suffix[16];
+        int is_ptz_value;
+
+        memset(model_suffix, '\0', sizeof(model_suffix));
+        get_model_suffix(model_suffix, sizeof(model_suffix));
+        is_ptz_value = is_ptz(model_suffix);
+
+        if (read_ptz(&cur_x, &cur_y) != 0) {
+            fprintf(stderr, "Error reading current ptz position\n");
+            return -1;
+        }
+        fprintf(stderr, "Current x  = %d, y  = %d\n", cur_x, cur_y);
+        fx = ((double) cur_x) / ((double) MAX_PTZ_X) * 360.0;
+        fy = ((double) cur_y) / ((double) MAX_PTZ_Y) * 180.0;
+        if (is_ptz_value == ALLWINNER_V2_ALT) {
+            fy = 180.0 - fy;
+        }
+
+        fprintf(stderr, "Degrees x  = %.1f, y  = %.1f\n", fx, fy);
+        fprintf(stdout, "%.1f,%.1f\n", fx, fy);
+    }
+
+    if (set_home_position != NONE) {
+        // Remove preset 0
+        memcpy(preset_msg, IPC_REMOVE_PRESET, sizeof(IPC_REMOVE_PRESET) - 1);
+        preset_msg[16] = 0;
+        mq_send(ipc_mq, preset_msg, sizeof(IPC_REMOVE_PRESET) - 1, 0);
+        // sleep 1 sec and add it again
+        sleep(1);
         mq_send(ipc_mq, IPC_ADD_PRESET, sizeof(IPC_ADD_PRESET) - 1, 0);
     }
 
diff --git a/src/ipc_cmd/ipc_cmd/ipc_cmd.h b/src/ipc_cmd/ipc_cmd/ipc_cmd.h
index 7cbb819..b9b5bdc 100644
--- a/src/ipc_cmd/ipc_cmd/ipc_cmd.h
+++ b/src/ipc_cmd/ipc_cmd/ipc_cmd.h
@@ -33,6 +33,9 @@
 
 #define NONE -1
 
+#define MAX_PTZ_X 4100
+#define MAX_PTZ_Y 1250
+
 #define IPC_MOTION_START "\x01\x00\x00\x00\x02\x00\x00\x00\x7c\x00\x7c\x00\x00\x00\x00\x00"
 #define IPC_MOTION_STOP "\x01\x00\x00\x00\x02\x00\x00\x00\x7d\x00\x7d\x00\x00\x00\x00\x00"
 
@@ -80,11 +83,13 @@
 #define IPC_MOVE_UP    "\x01\x00\x00\x00\x08\x00\x00\x00\x06\x40\x06\x40\x18\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00"
 #define IPC_MOVE_STOP  "\x01\x00\x00\x00\x08\x00\x00\x00\x07\x40\x01\x00\x00\x00\x00\x00"
 
-#define MOVE_RIGHT 0
-#define MOVE_LEFT  1
-#define MOVE_DOWN  2
+#define MOVE_STOP  0
+#define MOVE_RIGHT 2
+#define MOVE_LEFT  -2
 #define MOVE_UP    3
-#define MOVE_STOP  4
+#define MOVE_DOWN  -3
+
+#define IPC_JUMP_POSITION "\x01\x00\x00\x00\x08\x00\x00\x00\x09\x40\x09\x40\x18\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
 
 #define IPC_GOTO_PRESET    "\x01\x00\x00\x00\x08\x00\x00\x00\x02\x40\x01\x00\x04\x00\x00\x00\xff\x00\x00\x00"
 #define IPC_ADD_PRESET     "\x01\x00\x00\x00\x08\x00\x00\x00\x00\x40\x01\x00\x00\x00\x00\x00"
diff --git a/src/ipc_cmd/ipc_cmd/ipc_multiplex.c b/src/ipc_cmd/ipc_cmd/ipc_multiplex.c
index c6b9035..71dd30a 100644
--- a/src/ipc_cmd/ipc_cmd/ipc_multiplex.c
+++ b/src/ipc_cmd/ipc_cmd/ipc_multiplex.c
@@ -19,6 +19,8 @@ ssize_t (*original_mq_receive)(mqd_t, char*, size_t, unsigned int*);
 **/
 void ipc_multiplex_initialize() {
 
+    int i;
+
     // Enable debug mode if requested
     if (getenv(ENV_IPC_MULTIPLEX_DEBUG)) {
         debug = true;
@@ -33,7 +35,7 @@ void ipc_multiplex_initialize() {
     };
 
     char queue_name[64];
-    for (int i = 1; i < 10; i++) {
+    for (i = 1; i < 10; i++) {
         sprintf(queue_name, "%s_%d", IPC_QUEUE_NAME, i);
 
         // Open the message queue or create a new one if it does not exist
@@ -64,6 +66,8 @@ inline unsigned int get_message_target(char *msg_ptr) {
 **/
 ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned int *msg_prio) {
 
+    int i;
+
     // Initialize resources on first call.
     if (is_initialized == false) {
         ipc_multiplex_initialize();
@@ -74,7 +78,7 @@ ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned int *msg
 
     if (debug) {
         fprintf(stderr, "*** [IPC_MULTIPLEX] ");
-        for(int i = 0; i < bytes_read; i++)
+        for(i = 0; i < bytes_read; i++)
             fprintf(stderr, "%02x ", msg_ptr[i]);
         fprintf(stderr, "\n");
     }
@@ -85,7 +89,7 @@ ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned int *msg
 //    }
 
     // Resend the received message to the dispatch queues
-    for (int i = 1; i < 10; i++) {
+    for (i = 1; i < 10; i++) {
 
         // mq_send will fail with EAGAIN whenever the target message queue is full.
         if (mq_send(ipc_mq[i], msg_ptr, bytes_read, MESSAGE_PRIORITY) != 0 && errno != EAGAIN) {
@@ -95,4 +99,4 @@ ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned int *msg
 
     // Return like the original function would do
     return bytes_read;
-}
+}
\ No newline at end of file
diff --git a/src/ipc_cmd/ipc_cmd/ipc_notify.c b/src/ipc_cmd/ipc_cmd/ipc_notify.c
index d100f7a..8eeb363 100644
--- a/src/ipc_cmd/ipc_cmd/ipc_notify.c
+++ b/src/ipc_cmd/ipc_cmd/ipc_notify.c
@@ -72,8 +72,10 @@ char lookup[16] = {
 
 static int parse_message(char *buffer, char *cmd, ssize_t len)
 {
+    int i;
+
     // Convert message to hex string
-    for (int i = 0; i < len; i++) {
+    for (i = 0; i < len; i++) {
         message_buffer[i * 2]     = lookup[buffer[i] >>  4];
         message_buffer[i * 2 + 1] = lookup[buffer[i] & 0xF];
     }
diff --git a/src/ipc_cmd/ipc_cmd/ptz.c b/src/ipc_cmd/ipc_cmd/ptz.c
new file mode 100644
index 0000000..ce11035
--- /dev/null
+++ b/src/ipc_cmd/ipc_cmd/ptz.c
@@ -0,0 +1,111 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+
+#include "ptz.h"
+
+#define MODEL_SUFFIX_FILE_V5 "/home/app/.camver"
+#define MODEL_SUFFIX_FILE_MA "/home/yi-hack/model_suffix"
+#define MODEL_SUFFIX_FILE_A2 "/tmp/sd/yi-hack/model_suffix"
+
+int is_ptz(char *model) {
+    if ((strcmp("yi_dome", model) == 0) ||
+            (strcmp("yi_dome_1080p", model) == 0) ||
+            (strcmp("yi_cloud_dome_1080p", model) == 0)) {
+
+        return V5;
+
+    } else if ((strcmp("h201c", model) == 0) ||
+            (strcmp("h305r", model) == 0) ||
+            (strcmp("y30", model) == 0) ||
+            (strcmp("h307", model) == 0)) {
+
+        return MSTAR;
+
+    } else if (strcmp("y30qa", model) == 0) {
+
+        return ALLWINNER;
+
+    } else if ((strcmp("r30gb", model) == 0) ||
+            (strcmp("r35gb", model) == 0) ||
+            (strcmp("r40ga", model) == 0) ||
+            (strcmp("h60ga", model) == 0) ||
+            (strcmp("q321br_lsx", model) == 0) ||
+            (strcmp("qg311r", model) == 0) ||
+            (strcmp("b091qp", model) == 0)) {
+
+        return ALLWINNER_V2;
+
+    } else if ((strcmp("h30ga", model) == 0) ||
+            (strcmp("h51ga", model) == 0) ||
+            (strcmp("h52ga", model) == 0)) {
+
+        return ALLWINNER_V2_ALT;
+    } else {
+        return 0;
+    }
+}
+
+int get_model_suffix(char *model, int size)
+{
+    FILE *fileStream;
+
+    fileStream = fopen(MODEL_SUFFIX_FILE_V5, "r");
+    if (fileStream == NULL) {
+        fileStream = fopen(MODEL_SUFFIX_FILE_MA, "r");
+        if (fileStream == NULL) {
+            fileStream = fopen(MODEL_SUFFIX_FILE_A2, "r");
+            if (fileStream == NULL) {
+                return -1;
+            }
+        }
+    }
+    if (fgets (model, size, fileStream) == NULL)
+        return -2;
+    fclose(fileStream);
+    model[strcspn(model, "\r\n")] = '\0';
+
+    return 0;
+}
+
+int ssp_init()
+{
+    int fd, iRet;
+
+    fd = open("/dev/ssp", O_RDONLY);
+
+    return fd;
+}
+
+int read_ptz(int *px, int *py)
+{
+    int fd_ssp;
+    fd_ssp = ssp_init();
+    if (fd_ssp == -1) {
+        fprintf(stderr, "Error opening cpld\n");
+        return -1;
+    }
+
+    int iRet;
+    unsigned char pos[32];
+
+    memset(pos, '\0', 32);
+    iRet = ioctl(fd_ssp, 0x6d01, &pos);
+    if (iRet < 0) {
+        fprintf(stderr, "Error getting position\n");
+        fprintf(stderr, "ioctl failed and returned errno %s\n", strerror(errno));
+        close(fd_ssp);
+        return -2;
+    }
+
+    close(fd_ssp);
+
+    *px = *((int *) (&pos[0]));
+    *py = *((int *) (&pos[4]));
+
+    return 0;
+}
diff --git a/src/ipc_cmd/ipc_cmd/ptz.h b/src/ipc_cmd/ipc_cmd/ptz.h
new file mode 100644
index 0000000..30e5630
--- /dev/null
+++ b/src/ipc_cmd/ipc_cmd/ptz.h
@@ -0,0 +1,9 @@
+#define V5               1
+#define MSTAR            2
+#define ALLWINNER        3
+#define ALLWINNER_V2     4
+#define ALLWINNER_V2_ALT 5
+
+int is_ptz(char *model);
+int get_model_suffix(char *model, int size);
+int read_ptz(int *px, int *py);

From 599e2245b7085036ec9aca209f163851cb68edab Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Thu, 25 Jan 2024 10:16:55 +0100
Subject: [PATCH 47/81] Move preset.sh code to ptz_presets.sh

---
 .../home/yi-hack-v5/script/ptz_presets.sh     | 146 ++++++++++++++++++
 src/www/httpd/cgi-bin/preset.sh               |  78 ++++++++--
 src/www/httpd/htdocs/js/modules/ptz.js        |   2 +-
 3 files changed, 216 insertions(+), 10 deletions(-)
 create mode 100755 src/static/static/home/yi-hack-v5/script/ptz_presets.sh

diff --git a/src/static/static/home/yi-hack-v5/script/ptz_presets.sh b/src/static/static/home/yi-hack-v5/script/ptz_presets.sh
new file mode 100755
index 0000000..ab900eb
--- /dev/null
+++ b/src/static/static/home/yi-hack-v5/script/ptz_presets.sh
@@ -0,0 +1,146 @@
+#!/bin/sh
+
+YI_HACK_PREFIX="/tmp/sd/yi-hack-v5"
+PTZ_CONF_FILE=$YI_HACK_PREFIX/etc/ptz_presets.conf
+
+add_del_preset() {
+    FIRST_AVAIL=8
+    PRESET_0=""
+    PRESET_1=""
+    PRESET_2=""
+    PRESET_3=""
+    PRESET_4=""
+    PRESET_5=""
+    PRESET_6=""
+    PRESET_7=""
+
+    OLD_IFS="$IFS"
+    IFS="=,"
+    while read -r PNUM PNAME PX PY; do
+        if [ -z $PNUM ]; then
+            continue;
+        fi
+        if [ "${PNUM::1}" == "#" ]; then
+            continue;
+        fi
+        if [ -z $PNAME ] && [ $FIRST_AVAIL -gt $PNUM ]; then
+            FIRST_AVAIL=$PNUM
+        fi
+        if [ "$1" == "add" ] && [ "$PNAME" == "$2" ]; then
+            return 1
+        fi
+
+        for I in 0 1 2 3 4 5 6 7; do
+            if [ "$PNUM" == "$I" ]; then
+                eval PRESET_$I=$PNAME,$PX,$PY
+            fi
+        done
+    done < $PTZ_CONF_FILE
+
+    IFS="$OLD_IFS"
+
+    if [ "$1" == "add" ]; then
+        if [ $FIRST_AVAIL -le 7 ]; then
+            eval PRESET_$FIRST_AVAIL=$2,$3,$4
+        else
+            return 2
+        fi
+    fi
+
+    if [ "$1" == "del" ]; then
+        for I in 0 1 2 3 4 5 6 7; do
+            if [ "$2" == "$I" ] || [ "$2" == "all" ]; then
+                eval PRESET_$I=""
+            fi
+        done
+    fi
+
+    if [ "$1" == "add" ] || [ "$1" == "del" ]; then
+        echo 0=$PRESET_0 > $PTZ_CONF_FILE
+        echo 1=$PRESET_1 >> $PTZ_CONF_FILE
+        echo 2=$PRESET_2 >> $PTZ_CONF_FILE
+        echo 3=$PRESET_3 >> $PTZ_CONF_FILE
+        echo 4=$PRESET_4 >> $PTZ_CONF_FILE
+        echo 5=$PRESET_5 >> $PTZ_CONF_FILE
+        echo 6=$PRESET_6 >> $PTZ_CONF_FILE
+        echo 7=$PRESET_7 >> $PTZ_CONF_FILE
+    fi
+}
+
+ACTION="none"
+NUM=-1
+NAME=""
+
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    -a|--action)
+      ACTION="$2"
+      shift # past argument
+      shift # past value
+      ;;
+    -n|--number)
+      NUM="$2"
+      shift # past argument
+      shift # past value
+      ;;
+    -m|--name)
+      NAME="$2"
+      shift # past argument
+      shift # past value
+      ;;
+    -*|--*)
+      echo "Unknown option $1"
+      exit 1
+      ;;
+    *)
+      shift # past argument
+      ;;
+  esac
+done
+
+if [ $ACTION == "get_presets" ] ; then
+    cat $PTZ_CONF_FILE
+elif [ $ACTION == "go_preset" ] ; then
+    if [ $NUM -lt 0 ] || [ $NUM -gt 7 ] ; then
+        echo "Preset number out of range"
+        exit
+    fi
+    ipc_cmd -p $NUM
+elif [ $ACTION == "add_preset" ]; then
+    # add preset
+    POS=$(ipc_cmd -g)
+    if [ -z $POS ]; then
+        echo "Error getting PTZ position"
+        exit
+    fi
+    POSX=$(echo $POS | cut -d ',' -f 1)
+    POSY=$(echo $POS | cut -d ',' -f 2)
+    if [ -z $POSX ] || [ -z $POSY ]; then
+        echo "Error getting PTZ position"
+        exit
+    fi
+
+    add_del_preset add $NAME $POSX $POSY
+    RES=$?
+    if [ $RES -eq 1 ]; then
+        echo "Preset already exists"
+        exit
+    fi
+    if [ $RES -eq 2 ]; then
+        echo "No free preset available"
+        exit
+    fi
+    ipc_cmd -P $NAME
+elif [ $ACTION == "del_preset" ]; then
+    # del preset
+    add_del_preset del $NUM
+    ipc_cmd -R $NUM
+elif [ $ACTION == "set_home_position" ]; then
+    # set home position
+    add_del_preset del 0
+    add_del_preset add "Home"
+    ipc_cmd -H
+else
+    echo "Invalid action received"
+    exit
+fi
diff --git a/src/www/httpd/cgi-bin/preset.sh b/src/www/httpd/cgi-bin/preset.sh
index 3bfc5b7..962b95e 100755
--- a/src/www/httpd/cgi-bin/preset.sh
+++ b/src/www/httpd/cgi-bin/preset.sh
@@ -1,19 +1,79 @@
 #!/bin/sh
 
+YI_HACK_PREFIX="/tmp/sd/yi-hack-v5"
+PTZ_CONF_FILE=$YI_HACK_PREFIX/etc/ptz_presets.conf
+PTZ_SCRIPT=$YI_HACK_PREFIX/script/ptz_presets.sh
+
+. $YI_HACK_PREFIX/www/cgi-bin/validate.sh
+
+return_error() {
+    printf "Content-type: application/json\r\n\r\n"
+    printf "{\n"
+    printf "\"%s\":\"%s\",\\n" "error" "true"
+    printf "\"%s\":\"%s\"\\n" "message" "$@"
+    printf "}"
+}
+
+if ! $(validateQueryString $QUERY_STRING); then
+    return_error "Invalid query"
+    exit
+fi
+
+ACTION="none"
 NUM=-1
+NAME=""
+
+for I in 1 2 3
+do
+    CONF="$(echo $QUERY_STRING | cut -d'&' -f$I | cut -d'=' -f1)"
+    VAL="$(echo $QUERY_STRING | cut -d'&' -f$I | cut -d'=' -f2)"
 
-CONF="$(echo $QUERY_STRING | cut -d'=' -f1)"
-VAL="$(echo $QUERY_STRING | cut -d'=' -f2)"
+    if [ "$CONF" == "action" ] ; then
+        ACTION="$VAL"
+    elif [ "$CONF" == "num" ] ; then
+        if $(validateNumber $VAL); then
+            NUM="$VAL"
+        else
+            if [ "$VAL" == "all" ]; then
+                NUM="$VAL"
+            else
+                return_error "Wrong arguments"
+                exit
+            fi
+        fi
+    elif [ "$CONF" == "name" ] ; then
+        if $(validateString $VAL); then
+            NAME="$VAL"
+        else
+            return_error "Wrong arguments"
+            exit
+        fi
+    fi
+done
 
-if [ "$CONF" == "num" ] ; then
-    NUM=$VAL
+if [ "$ACTION" == "none" ] || [ "$ACTION" == "get_presets" ]; then
+    return_error -99
+    exit
 fi
 
-if [ $NUM -ne -1 ] ; then
-    ipc_cmd -p $NUM
+if [ "$NUM" != "-1" ]; then
+    NUM="-n $NUM"
+else
+    NUM=""
+fi
+if [ ! -z $NAME ]; then
+    NAME="-m $NAME"
+else
+    NAME=""
 fi
 
-printf "Content-type: application/json\r\n\r\n"
+RES=$($PTZ_SCRIPT -a $ACTION $NUM $NAME)
 
-printf "{\n"
-printf "}"
+if [ "$RES" == "" ]; then
+    printf "Content-type: application/json\r\n\r\n"
+    printf "{\n"
+    printf "\"%s\":\"%s\"\\n" "error" "false"
+    printf "}"
+else
+    return_error $RES
+fi
diff --git a/src/www/httpd/htdocs/js/modules/ptz.js b/src/www/httpd/htdocs/js/modules/ptz.js
index 25d3817..bab37d2 100644
--- a/src/www/httpd/htdocs/js/modules/ptz.js
+++ b/src/www/httpd/htdocs/js/modules/ptz.js
@@ -61,7 +61,7 @@ APP.ptz = (function ($) {
         $(button).attr("disabled", true);
         $.ajax({
             type: "GET",
-            url: 'cgi-bin/preset.sh?num='+$(select + " option:selected").text(),
+            url: 'cgi-bin/preset.sh?action=go_preset&num='+$(select + " option:selected").text(),
             dataType: "json",
             error: function(response) {
                 console.log('error', response);

From 516bd32b5ca1bbc4fb7f17d7c98ffd0b93f8dc2d Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Thu, 25 Jan 2024 10:22:02 +0100
Subject: [PATCH 48/81] Add add/delete ptz presets

---
 .../home/yi-hack-v5/etc/ptz_presets.conf      |  8 ++
 src/www/httpd/htdocs/js/modules/ptz.js        | 84 ++++++++++++++++
 src/www/httpd/htdocs/pages/ptz.html           | 99 ++++++++++++++-----
 3 files changed, 167 insertions(+), 24 deletions(-)
 create mode 100644 src/static/static/home/yi-hack-v5/etc/ptz_presets.conf

diff --git a/src/static/static/home/yi-hack-v5/etc/ptz_presets.conf b/src/static/static/home/yi-hack-v5/etc/ptz_presets.conf
new file mode 100644
index 0000000..1becf62
--- /dev/null
+++ b/src/static/static/home/yi-hack-v5/etc/ptz_presets.conf
@@ -0,0 +1,8 @@
+0=
+1=
+2=
+3=
+4=
+5=
+6=
+7=
diff --git a/src/www/httpd/htdocs/js/modules/ptz.js b/src/www/httpd/htdocs/js/modules/ptz.js
index bab37d2..e7424ca 100644
--- a/src/www/httpd/htdocs/js/modules/ptz.js
+++ b/src/www/httpd/htdocs/js/modules/ptz.js
@@ -5,6 +5,7 @@ APP.ptz = (function ($) {
     function init() {
         updatePage();
         registerEventHandler();
+        initPage();
         snapshotTimer();
     }
 
@@ -73,6 +74,89 @@ APP.ptz = (function ($) {
         });
     }
 
+    function addPreset(button) {
+        $(button).attr("disabled", true);
+        $.ajax({
+            type: "POST",
+            url: 'cgi-bin/preset.sh?action=add_preset&name='+$('input[type="text"][data-key="PRESET_NAME"]').prop('value'),
+            dataType: "json",
+            error: function(response) {
+                console.log('error', response);
+                $(button).attr("disabled", false);
+            },
+            success: function(data) {
+                $(button).attr("disabled", false);
+                window.location.reload();
+            }
+        });
+    }
+
+    function delPreset(button, select) {
+        $(button).attr("disabled", true);
+        $.ajax({
+            type: "POST",
+            url: 'cgi-bin/preset.sh?action=del_preset&num='+$(select + " option:selected").val(),
+            dataType: "json",
+            error: function(response) {
+                console.log('error', response);
+                $(button).attr("disabled", false);
+            },
+            success: function(data) {
+                $(button).attr("disabled", false);
+                window.location.reload();
+            }
+        });
+    }
+
+    function delAllPreset(button) {
+        $(button).attr("disabled", true);
+        $.ajax({
+            type: "POST",
+            url: 'cgi-bin/preset.sh?action=del_preset&num=all',
+            dataType: "json",
+            error: function(response) {
+                console.log('error', response);
+                $(button).attr("disabled", false);
+            },
+            success: function(data) {
+                $(button).attr("disabled", false);
+                window.location.reload();
+            }
+        });
+    }
+
+    function initPage() {
+        $.ajax({
+            type: "GET",
+            url: 'cgi-bin/get_configs.sh?conf=ptz_presets',
+            dataType: "json",
+            success: function(data) {
+                html = "<select id=\"select-goto\">\n";
+                for (let key in data) {
+                    if (key != "NULL") {
+                        fields = data[key].split(',');
+                        html += "<option value=\"" + key + "\">" + key + " - " + fields[0] + "</option>\n";
+                    }
+                }
+                html += "</select>\n";
+                document.getElementById("select-goto-container").innerHTML = html;
+
+                html = "<select id=\"select-del\">\n";
+                for (let key in data) {
+                    if (key != "NULL") {
+                        fields = data[key].split(',');
+                        html += "<option value=\"" + key + "\">" + key + " - " + fields[0] + "</option>\n";
+                    }
+                }
+                html += "</select>\n";
+                document.getElementById("select-del-container").innerHTML = html;
+            },
+            error: function(response) {
+                console.log('error', response);
+            }
+        });
+    }
+
     function updatePage() {
         $.ajax({
             type: "GET",
diff --git a/src/www/httpd/htdocs/pages/ptz.html b/src/www/httpd/htdocs/pages/ptz.html
index 054e731..a8fc6f9 100644
--- a/src/www/httpd/htdocs/pages/ptz.html
+++ b/src/www/httpd/htdocs/pages/ptz.html
@@ -1,5 +1,5 @@
 <div class="row">
-    <div class="twelve columns">
+    <div class="twelf columns">
         <h3 class="no-margin" id="header">PTZ</h3>
         <hr class="tiny-margin"/>
         <div id="ptz_description" class="row">
@@ -7,7 +7,7 @@ <h3 class="no-margin" id="header">PTZ</h3>
                 In this page you can move your cam.
             </p>
         </div>
-        <div id="ptz_available" class="row" style="display: none;">
+        <div id="ptz_unavailable" class="row" style="display: none;">
             <p>
                 PTZ functions are not available for this camera model.
             </p>
@@ -38,29 +38,80 @@ <h4 class="no-margin">Move pad</h4>
                 </tbody>
             </table>
 
-            <h4 class="no-margin">Presets</h4>
+            <h4 class="no-margin">Go to Preset</h4>
             <hr class="tiny-margin"/>
-            <table class="u-full-width ptz-table">
-                <tbody>
-                <tr class="row">
-                    <td>
-                        <select id="select-goto">
-                            <option value="0">0</option>
-                            <option value="1">1</option>
-                            <option value="2">2</option>
-                            <option value="3">3</option>
-                            <option value="4">4</option>
-                            <option value="5">5</option>
-                            <option value="6">6</option>
-                            <option value="7">7</option>
-                        </select>
-                    </td>
-                    <td>
-                        <input class="button-primary" type="button" id="button-goto" value="Goto Preset"/>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
+            <div class="row">
+                <div class="twelve columns configs-switch">
+                    <table class="u-full-width padded-table config-table">
+                        <tbody>
+                        <tr class="row">
+                            <td>Preset Number</td>
+                            <td>
+                                <div id="select-goto-container" class="standard-select">
+                                </div>
+                                <span class="switch-description">
+                                    Number of the preset.
+                                </span>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+
+            <div class="float-right">
+                <input class="button-primary" type="button" id="button-goto" value="Go To Preset"/>
+            </div>
+
+            <br/>
+
+            <h4 class="no-margin">Add Preset</h4>
+            <hr class="tiny-margin"/>
+            <div class="row">
+                <div class="twelve columns configs-switch">
+                    <table class="u-full-width padded-table config-table">
+                        <tbody>
+                        <tr class="row">
+                            <td>Preset Name</td>
+                            <td>
+                                <input class="u-full-width" type="text" placeholder="" data-key="PRESET_NAME" id="PRESET_NAME"/>
+                                <span class="switch-description">
+                                    Name of the preset to add (space char is not allowed).
+                                </span>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+
+            <div class="float-right">
+                <input class="button-primary" type="button" id="button-add" value="Add Preset"/>
+            </div>
+
+            <h4 class="no-margin">Delete Preset</h4>
+            <hr class="tiny-margin"/>
+            <div class="row">
+                <div class="twelve columns configs-switch">
+                    <table class="u-full-width padded-table config-table">
+                        <tbody>
+                        <tr class="row">
+                            <td>Preset Number</td>
+                            <td>
+                                <div id="select-del-container" class="standard-select">
+                                </div>
+                                <span class="switch-description">
+                                    Number of the preset to remove.
+                                </span>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+
+            <div class="float-right">
+                <input class="button-primary" type="button" id="button-del-all" value="Delete All Preset"/>
+                &nbsp;
+                <input class="button-primary" type="button" id="button-del" value="Delete Preset"/>
+            </div>
         </div>
     </div>
 </div>

From fe3cb7de76d4180bd38f47976d6dc17d891ec77e Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Thu, 25 Jan 2024 11:31:51 +0100
Subject: [PATCH 49/81] Add ipc2file: create a tmp file when an event is
 triggered

---
 src/ipc_cmd/compile.ipc_cmd    |   1 +
 src/ipc_cmd/ipc_cmd/Makefile   |  21 +-
 src/ipc_cmd/ipc_cmd/ipc2file.c | 589 +++++++++++++++++++++++++++++++++
 src/ipc_cmd/ipc_cmd/ipc2file.h |  87 +++++
 4 files changed, 687 insertions(+), 11 deletions(-)
 create mode 100644 src/ipc_cmd/ipc_cmd/ipc2file.c
 create mode 100644 src/ipc_cmd/ipc_cmd/ipc2file.h

diff --git a/src/ipc_cmd/compile.ipc_cmd b/src/ipc_cmd/compile.ipc_cmd
index 4bfcfe2..d65801e 100755
--- a/src/ipc_cmd/compile.ipc_cmd
+++ b/src/ipc_cmd/compile.ipc_cmd
@@ -30,6 +30,7 @@ mkdir -p ../_install/lib || exit 1
 cp ./ipc_cmd ../_install/bin || exit 1
 cp ./ipc_read ../_install/bin || exit 1
 cp ./ipc_notify ../_install/bin || exit 1
+cp ./ipc2file ../_install/bin || exit 1
 cp ./ipc_multiplex.so ../_install/lib || exit 1
 
 ${STRIP} ../_install/bin/* || exit 1
diff --git a/src/ipc_cmd/ipc_cmd/Makefile b/src/ipc_cmd/ipc_cmd/Makefile
index 12caa7e..fa53782 100644
--- a/src/ipc_cmd/ipc_cmd/Makefile
+++ b/src/ipc_cmd/ipc_cmd/Makefile
@@ -1,20 +1,13 @@
 OBJECTS_C = ipc_cmd.o ptz.o
 OBJECTS_R = ipc_read.o
 OBJECTS_N = ipc_notify.o
+OBJECTS_2 = ipc2file.o
 LIBS = -lpthread -lrt -lm
+LIBS_2 = -lrt -lpthread
 
-all: ipc_cmd ipc_read ipc_notify ipc_multiplex.so
+all: ipc_cmd ipc_read ipc_notify ipc2file ipc_multiplex.so
 
-ipc_cmd.o: ipc_cmd.c $(HEADERS)
-	$(CC) -c $< -D_GNU_SOURCE -std=c99 -fPIC -O2 -o $@
-
-ptz.o: ptz.c $(HEADERS)
-	$(CC) -c $< -D_GNU_SOURCE -std=c99 -fPIC -O2 -o $@
-
-ipc_read.o: ipc_read.c $(HEADERS)
-	$(CC) -c $< -D_GNU_SOURCE -std=c99 -fPIC -O2 -o $@
-
-ipc_notify.o: ipc_notify.c $(HEADERS)
+%.o: %.c $(HEADERS)
 	$(CC) -c $< -D_GNU_SOURCE -std=c99 -fPIC -O2 -o $@
 
 ipc_multiplex.so: ipc_multiplex.c $(HEADERS)
@@ -32,13 +25,19 @@ ipc_notify: $(OBJECTS_N)
 	$(CC) $(OBJECTS_N) $(LIBS) -fPIC -O2 -o $@
 	$(STRIP) $@
 
+ipc2file: $(OBJECTS_2)
+	$(CC) $(OBJECTS_2) $(LIBS_2) -fPIC -Os -o $@
+	$(STRIP) $@
+
 .PHONY: clean
 
 clean:
 	rm -f ipc_cmd
 	rm -f ipc_read
 	rm -f ipc_notify
+	rm -f ipc2file
 	rm -f ipc_multiplex.so
 	rm -f $(OBJECTS_C)
 	rm -f $(OBJECTS_R)
 	rm -f $(OBJECTS_N)
+	rm -f $(OBJECTS_2)
diff --git a/src/ipc_cmd/ipc_cmd/ipc2file.c b/src/ipc_cmd/ipc_cmd/ipc2file.c
new file mode 100644
index 0000000..de28148
--- /dev/null
+++ b/src/ipc_cmd/ipc_cmd/ipc2file.c
@@ -0,0 +1,589 @@
+/*
+ * Copyright (c) 2023 roleo.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Convert events received via IPC queue to tmp files.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <time.h>
+#include <signal.h>
+#include <getopt.h>
+#include <errno.h>
+#include <limits.h>
+
+#include "ipc2file.h"
+
+#define DEFAULT_PID_FILE "/var/run/ipc2file.pid"
+
+#define DEFAULT_QUEUE_NUMBER 2
+
+#define BD_NO_CHDIR          01
+#define BD_NO_CLOSE_FILES    02
+#define BD_NO_REOPEN_STD_FDS 04
+
+#define BD_NO_UMASK0        010
+#define BD_MAX_CLOSE       8192
+
+#define PID_SIZE 32
+
+mqd_t ipc_mq;
+int queue_number;
+int debug;
+
+static int open_queue();
+static int clear_queue();
+static void call_callback(IPC_MESSAGE_TYPE type);
+
+typedef void(*func_ptr_t)(void* arg);
+func_ptr_t *ipc_callbacks;
+
+int exit_main = 0;
+int last_alarm = -1;
+
+int ipc_init()
+{
+    int ret;
+
+    ret = open_queue();
+    if(ret != 0)
+        return -1;
+
+    ret = clear_queue();
+    if(ret != 0)
+        return -2;
+
+    ipc_callbacks = malloc((sizeof(func_ptr_t)) * IPC_MSG_LAST);
+
+    return 0;
+}
+
+void ipc_stop()
+{
+    free(ipc_callbacks);
+
+    if(ipc_mq > 0)
+        mq_close(ipc_mq);
+}
+
+static int open_queue()
+{
+    char queue_name[256];
+
+    sprintf(queue_name, "%s_%d", IPC_QUEUE_NAME, queue_number);
+    ipc_mq = mq_open(queue_name, O_RDONLY);
+    if(ipc_mq == -1) {
+        fprintf(stderr, "Can't open mqueue %s. Error: %s\n", queue_name, strerror(errno));
+        return -1;
+    }
+    return 0;
+}
+
+static int clear_queue()
+{
+    struct mq_attr attr;
+    char buffer[IPC_MESSAGE_MAX_SIZE + 1];
+
+    if (mq_getattr(ipc_mq, &attr) == -1) {
+        fprintf(stderr, "Can't get queue attributes\n");
+        return -1;
+    }
+
+    while (attr.mq_curmsgs > 0) {
+        if (debug) fprintf(stderr, "Clear message in queue...\n");
+        mq_receive(ipc_mq, buffer, IPC_MESSAGE_MAX_SIZE, NULL);
+        if (debug) fprintf(stderr, "...done.\n");
+        if (mq_getattr(ipc_mq, &attr) == -1) {
+            fprintf(stderr, "Can't get queue attributes\n");
+            return -1;
+        }
+    }
+
+    return 0;
+}
+
+static void handle_ipc_unrecognized()
+{
+    if (debug) fprintf(stderr, "GOT UNRECOGNIZED MESSAGE\n");
+//    call_callback(IPC_MSG_UNRECOGNIZED);
+}
+
+static void handle_ipc_motion_generic(int detect)
+{
+    fprintf(stderr, "GOT GENERIC MOTION\n");
+    call_callback(detect);
+}
+
+int ipc_set_callback(IPC_MESSAGE_TYPE type, void (*f)())
+{
+    if(type>=IPC_MSG_LAST)
+        return -1;
+
+    ipc_callbacks[(int)type]=f;
+
+    return 0;
+}
+
+static void call_callback(IPC_MESSAGE_TYPE type)
+{
+    func_ptr_t f;
+    f=ipc_callbacks[(int)type];
+    if(f!=NULL)
+        (*f)(&type);
+}
+
+int parse_message(char *msg, ssize_t len)
+{
+    int i;
+
+    if (debug) fprintf(stderr, "Parsing message\n");
+
+    for (i = 0; i < len; i++)
+        if (debug) fprintf(stderr, "%02x ", msg[i]);
+    if (debug) fprintf(stderr, "Parsing message completed\n");
+
+    if((len >= sizeof(IPC_MOTION_START) - 1) && (memcmp(msg, IPC_MOTION_START, sizeof(IPC_MOTION_START) - 1)==0))
+    {
+        handle_ipc_motion_generic(IPC_MSG_MOTION_START);
+        return 0;
+    }
+    if((len >= sizeof(IPC_MOTION_START_C) - 1) && (memcmp(msg, IPC_MOTION_START_C, sizeof(IPC_MOTION_START_C) - 1)==0))
+    {
+        handle_ipc_motion_generic(IPC_MSG_MOTION_START);
+        return 0;
+    }
+    else if((len >= sizeof(IPC_MOTION_STOP) - 1) && (memcmp(msg, IPC_MOTION_STOP, sizeof(IPC_MOTION_STOP) - 1)==0))
+    {
+        handle_ipc_motion_generic(IPC_MSG_MOTION_STOP);
+        return 0;
+    }
+    else if((len >= sizeof(IPC_AI_HUMAN_DETECTION) - 1) && (memcmp(msg, IPC_AI_HUMAN_DETECTION, sizeof(IPC_AI_HUMAN_DETECTION) - 1)==0))
+    {
+        handle_ipc_motion_generic(IPC_MSG_AI_HUMAN_DETECTION);
+        return 0;
+    }
+    else if((len >= sizeof(IPC_AI_BODY_DETECTION_C) - 1) && (memcmp(msg, IPC_AI_BODY_DETECTION_C, sizeof(IPC_AI_BODY_DETECTION_C) - 1)==0))
+    {
+        handle_ipc_motion_generic(IPC_MSG_AI_HUMAN_DETECTION);
+        return 0;
+    }
+    else if((len >= sizeof(IPC_AI_VEHICLE_DETECTION_C) - 1) && (memcmp(msg, IPC_AI_VEHICLE_DETECTION_C, sizeof(IPC_AI_VEHICLE_DETECTION_C) - 1)==0))
+    {
+        handle_ipc_motion_generic(IPC_MSG_AI_VEHICLE_DETECTION);
+        return 0;
+    }
+    else if((len >= sizeof(IPC_AI_ANIMAL_DETECTION_C) - 1) && (memcmp(msg, IPC_AI_ANIMAL_DETECTION_C, sizeof(IPC_AI_ANIMAL_DETECTION_C) - 1)==0))
+    {
+        handle_ipc_motion_generic(IPC_MSG_AI_ANIMAL_DETECTION);
+        return 0;
+    }
+    else if((len >= sizeof(IPC_BABY_CRYING) - 1) && (memcmp(msg, IPC_BABY_CRYING, sizeof(IPC_BABY_CRYING) - 1)==0))
+    {
+        handle_ipc_motion_generic(IPC_MSG_BABY_CRYING);
+        return 0;
+    }
+    else if((len >= sizeof(IPC_SOUND_DETECTION) - 1) && (memcmp(msg, IPC_SOUND_DETECTION, sizeof(IPC_SOUND_DETECTION) - 1)==0))
+    {
+        handle_ipc_motion_generic(IPC_MSG_SOUND_DETECTION);
+        return 0;
+    }
+    handle_ipc_unrecognized();
+
+    return 0;
+}
+
+int daemonize(int flags)
+{
+    int maxfd, fd;
+
+    switch(fork()) {
+        case -1: return -1;
+        case 0: break;
+        default: _exit(EXIT_SUCCESS);
+    }
+
+    if(setsid() == -1)
+        return -1;
+
+    switch(fork()) {
+        case -1: return -1;
+        case 0: break;
+        default: _exit(EXIT_SUCCESS);
+    }
+
+    if(!(flags & BD_NO_UMASK0))
+        umask(0);
+
+    if(!(flags & BD_NO_CHDIR))
+        chdir("/");
+
+    if(!(flags & BD_NO_CLOSE_FILES)) {
+        maxfd = sysconf(_SC_OPEN_MAX);
+        if(maxfd == -1)
+            maxfd = BD_MAX_CLOSE;
+        for(fd = 0; fd < maxfd; fd++)
+            close(fd);
+    }
+
+    if(!(flags & BD_NO_REOPEN_STD_FDS)) {
+        close(STDIN_FILENO);
+
+        fd = open("/dev/null", O_RDWR);
+        if(fd != STDIN_FILENO)
+            return -1;
+        if(dup2(STDIN_FILENO, STDOUT_FILENO) != STDOUT_FILENO)
+            return -2;
+        if(dup2(STDIN_FILENO, STDERR_FILENO) != STDERR_FILENO)
+            return -3;
+    }
+
+    return 0;
+}
+
+int check_pid(char *file_name)
+{
+    FILE *f;
+    long pid;
+    char pid_buffer[PID_SIZE];
+
+    f = fopen(file_name, "r");
+    if(f == NULL)
+        return 0;
+
+    if (fgets(pid_buffer, PID_SIZE, f) == NULL) {
+        fclose(f);
+        return 0;
+    }
+    fclose(f);
+
+    if (sscanf(pid_buffer, "%ld", &pid) != 1) {
+        return 0;
+    }
+
+    if (kill(pid, 0) == 0) {
+        return 1;
+    }
+
+    return 0;
+}
+
+int create_pid(char *file_name)
+{
+    FILE *f;
+    char pid_buffer[PID_SIZE];
+
+    f = fopen(file_name, "w");
+    if (f == NULL)
+        return -1;
+
+    memset(pid_buffer, '\0', PID_SIZE);
+    sprintf(pid_buffer, "%ld\n", (long) getpid());
+    if (fwrite(pid_buffer, strlen(pid_buffer), 1, f) != 1) {
+        fclose(f);
+        return -2;
+    }
+    fclose(f);
+
+    return 0;
+}
+
+void signal_handler(int signal)
+{
+    // Exit from main loop
+    exit_main = 1;
+}
+
+void *sound_stop_thread(void *arg)
+{
+    int i;
+
+    sleep(60);
+    remove(FILE_SOUND_DETECTION);
+
+    return NULL;
+}
+
+void process_event(int *alarm)
+{
+    FILE *fp;
+    int i;
+    int alarm_index = -1;
+    char value[8];
+
+    time_t now;
+
+    switch (*alarm) {
+        case IPC_MSG_MOTION_START:
+            fp = fopen(FILE_MOTION_START, "w");
+            if (fp == NULL) {
+                fprintf(stderr, "Couldn't open file\n");
+                return;
+            }
+            fclose(fp);
+            break;
+        case IPC_MSG_AI_HUMAN_DETECTION:
+            fp = fopen(FILE_AI_HUMAN_DETECTION, "w");
+            if (fp == NULL) {
+                fprintf(stderr, "Couldn't open file\n");
+                return;
+            }
+            fclose(fp);
+            break;
+        case IPC_MSG_AI_VEHICLE_DETECTION:
+            fp = fopen(FILE_AI_VEHICLE_DETECTION, "w");
+            if (fp == NULL) {
+                fprintf(stderr, "Couldn't open file\n");
+                return;
+            }
+            fclose(fp);
+            break;
+        case IPC_MSG_AI_ANIMAL_DETECTION:
+            fp = fopen(FILE_AI_ANIMAL_DETECTION, "w");
+            if (fp == NULL) {
+                fprintf(stderr, "Couldn't open file\n");
+                return;
+            }
+            fclose(fp);
+            break;
+        case IPC_MSG_BABY_CRYING:
+            fp = fopen(FILE_BABY_CRYING, "w");
+            if (fp == NULL) {
+                fprintf(stderr, "Couldn't open file\n");
+                return;
+            }
+            fclose(fp);
+            break;
+        case IPC_MSG_SOUND_DETECTION:
+            fp = fopen(FILE_SOUND_DETECTION, "w");
+            if (fp == NULL) {
+                fprintf(stderr, "Couldn't open file\n");
+                return;
+            }
+            fclose(fp);
+
+            pthread_t sound_stop_pthread;
+            pthread_create(&sound_stop_pthread, NULL, sound_stop_thread, NULL);
+            pthread_detach(sound_stop_pthread);
+            break;
+        case IPC_MSG_MOTION_STOP:
+            switch (last_alarm) {
+                case IPC_MSG_MOTION_START:
+                    remove(FILE_MOTION_START);
+                    break;
+                case IPC_MSG_AI_HUMAN_DETECTION:
+                    remove(FILE_AI_HUMAN_DETECTION);
+                    break;
+                case IPC_MSG_AI_VEHICLE_DETECTION:
+                    remove(FILE_AI_VEHICLE_DETECTION);
+                    break;
+                case IPC_MSG_AI_ANIMAL_DETECTION:
+                    remove(FILE_AI_ANIMAL_DETECTION);
+                    break;
+                case IPC_MSG_BABY_CRYING:
+                    remove(FILE_BABY_CRYING);
+                    break;
+            }
+            break;
+    }
+
+    if (*alarm != IPC_MSG_SOUND_DETECTION)
+        last_alarm = *alarm;
+
+    if (*alarm == IPC_MSG_MOTION_STOP) {
+        fprintf(stderr, "CALLBACK MOTION %d STOP\n", *alarm);
+    } else {
+        fprintf(stderr, "CALLBACK MOTION %d\n", *alarm);
+    }
+}
+
+void callback_motion_generic(void *arg)
+{
+    process_event((int *) arg);
+}
+
+void print_usage(char *progname)
+{
+    fprintf(stderr, "\nUsage: %s [-p PID_FILE] [-q NUM] [-f] [-d LEVEL]\n\n", progname);
+    fprintf(stderr, "\t-p PID_FILE, --pid_file PID_FILE\n");
+    fprintf(stderr, "\t\tpid file\n");
+    fprintf(stderr, "\t-q NUM, --queue_number NUM\n");
+    fprintf(stderr, "\t\tid of the ipc queue\n");
+    fprintf(stderr, "\t-f, --foreground\n");
+    fprintf(stderr, "\t\tdon't daemonize\n");
+    fprintf(stderr, "\t-d, --debug\n");
+    fprintf(stderr, "\t\tenable debug\n");
+    fprintf(stderr, "\t-h, --help\n");
+    fprintf(stderr, "\t\tprint this help\n");
+}
+
+int main(int argc, char **argv)
+{
+    int errno;
+    char *endptr;
+    int c, ret;
+    char pid_file[1024];
+    int foreground;
+
+    ssize_t bytes_read;
+    char buffer[IPC_MESSAGE_MAX_SIZE + 1];
+    long size;
+
+    strcpy(pid_file, DEFAULT_PID_FILE);
+    queue_number = DEFAULT_QUEUE_NUMBER;
+    foreground = 0;
+    debug = 0;
+
+    while (1) {
+        static struct option long_options[] =
+        {
+            {"pid_file",  required_argument, 0, 'p'},
+            {"queue_number",  required_argument, 0, 'q'},
+            {"foreground",  no_argument, 0, 'f'},
+            {"debug",  no_argument, 0, 'd'},
+            {"help",  no_argument, 0, 'h'},
+            {0, 0, 0, 0}
+        };
+        /* getopt_long stores the option index here. */
+        int option_index = 0;
+
+        c = getopt_long (argc, argv, "p:q:fdh",
+                         long_options, &option_index);
+
+        /* Detect the end of the options. */
+        if (c == -1)
+            break;
+
+        switch (c) {
+        case 'p':
+            if (strlen(optarg) < 1024)
+                strcpy(pid_file, optarg);
+            break;
+
+        case 'q':
+            errno = 0;    /* To distinguish success/failure after call */
+            queue_number = strtol(optarg, &endptr, 10);
+
+            /* Check for various possible errors */
+            if ((errno == ERANGE && (queue_number == LONG_MAX || queue_number == LONG_MIN)) || (errno != 0 && queue_number == 0)) {
+                print_usage(argv[0]);
+                exit(EXIT_FAILURE);
+            }
+            if (queue_number <= 0 || queue_number >= 10) {
+                print_usage(argv[0]);
+                exit(EXIT_FAILURE);
+            }
+            if (endptr == optarg) {
+                print_usage(argv[0]);
+                exit(EXIT_FAILURE);
+            }
+            break;
+
+        case 'f':
+            foreground = 1;
+            break;
+
+        case 'd':
+            debug = 1;
+            break;
+
+        case 'h':
+            print_usage(argv[0]);
+            exit(EXIT_SUCCESS);
+            break;
+
+        case '?':
+            /* getopt_long already printed an error message. */
+            break;
+
+        default:
+            print_usage(argv[0]);
+            exit(EXIT_SUCCESS);
+        }
+    }
+
+    // Set signal handler
+    signal(SIGTERM, signal_handler);
+    signal(SIGINT, signal_handler);
+
+    if (foreground == 0) {
+        ret = daemonize(0);
+        if (ret) {
+            fprintf(stderr, "Error starting daemon.\n");
+            exit(EXIT_FAILURE);
+        }
+    } else {
+        fprintf(stderr, "Don't daemonize\n");
+    }
+
+    fprintf(stderr, "Starting program.\n");
+
+    if (debug) fprintf(stderr, "pid_file = %s\n", pid_file);
+    if (debug) fprintf(stderr, "queue_number = %d\n", queue_number);
+
+    // Checking pid file
+    if (check_pid(pid_file) == 1) {
+        fprintf(stderr, "Program is already running.\n");
+        exit(EXIT_FAILURE);
+    }
+    if (create_pid(pid_file) < 0) {
+        fprintf(stderr, "Error creating pid file %s\n", pid_file);
+        exit(EXIT_FAILURE);
+    }
+
+    struct stat st = {0};
+    if (stat(PARENT_DIR, &st) == -1) {
+        mkdir(PARENT_DIR, 0755);
+    }
+
+    ret = ipc_init();
+    if(ret != 0) {
+        ipc_stop();
+        exit(EXIT_FAILURE);
+    }
+
+    ipc_set_callback(IPC_MSG_MOTION_START, &callback_motion_generic);
+    ipc_set_callback(IPC_MSG_MOTION_STOP, &callback_motion_generic);
+    ipc_set_callback(IPC_MSG_AI_HUMAN_DETECTION, &callback_motion_generic);
+    ipc_set_callback(IPC_MSG_AI_VEHICLE_DETECTION, &callback_motion_generic);
+    ipc_set_callback(IPC_MSG_AI_ANIMAL_DETECTION, &callback_motion_generic);
+    ipc_set_callback(IPC_MSG_BABY_CRYING, &callback_motion_generic);
+    ipc_set_callback(IPC_MSG_SOUND_DETECTION, &callback_motion_generic);
+
+    int i;
+    while(exit_main != 1) {
+        bytes_read = mq_receive(ipc_mq, buffer, IPC_MESSAGE_MAX_SIZE, NULL);
+
+        if (debug) fprintf(stderr, "IPC message. Len: %d. Status: %s!\n", bytes_read, strerror(errno));
+
+        if(bytes_read >= 0) {
+            parse_message(buffer, bytes_read);
+        }
+
+        usleep(500 * 1000);
+    }
+
+    ipc_stop();
+
+    unlink(pid_file);
+    fprintf(stderr, "Terminating program.\n");
+
+    return 0;
+}
diff --git a/src/ipc_cmd/ipc_cmd/ipc2file.h b/src/ipc_cmd/ipc_cmd/ipc2file.h
new file mode 100644
index 0000000..00e1951
--- /dev/null
+++ b/src/ipc_cmd/ipc_cmd/ipc2file.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2023 roleo.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef IPC2FILE_H
+#define IPC2FILE_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <limits.h>
+#include <time.h>
+#include <getopt.h>
+#include <mqueue.h>
+#include <pthread.h>
+
+#define IPC_QUEUE_NAME          "/ipc_dispatch"
+#define IPC_MESSAGE_MAX_SIZE    512
+
+// IPC events
+#define IPC_MOTION_START                "\x01\x00\x00\x00\x02\x00\x00\x00\x7c\x00\x7c\x00\x00\x00\x00\x00"
+#define IPC_MOTION_START_C              "\x04\x00\x00\x00\x02\x00\x00\x00\x09\x70\x09\x70\x00\x00\x00\x00"
+#define IPC_MOTION_STOP                 "\x01\x00\x00\x00\x02\x00\x00\x00\x7d\x00\x7d\x00\x00\x00\x00\x00"
+#define IPC_AI_HUMAN_DETECTION          "\x01\x00\x00\x00\x02\x00\x00\x00\xed\x00\xed\x00\x00\x00\x00\x00"
+#define IPC_AI_BODY_DETECTION_C         "\x04\x00\x00\x00\x02\x00\x00\x00\x06\x70\x06\x70\x00\x00\x00\x00"
+#define IPC_AI_VEHICLE_DETECTION_C      "\x04\x00\x00\x00\x02\x00\x00\x00\x07\x70\x07\x70\x00\x00\x00\x00"
+#define IPC_AI_ANIMAL_DETECTION_C       "\x04\x00\x00\x00\x02\x00\x00\x00\x08\x70\x08\x70\x00\x00\x00\x00"
+#define IPC_BABY_CRYING                 "\x04\x00\x00\x00\x02\x00\x00\x00\x02\x60\x02\x60\x00\x00\x00\x00"
+#define IPC_SOUND_DETECTION             "\x04\x00\x00\x00\x02\x00\x00\x00\x04\x60\x04\x60\x00\x00\x00\x00"
+
+#define PARENT_DIR                      "/tmp/onvif_notify_server"
+#define FILE_MOTION_START               "/tmp/onvif_notify_server/motion_alarm"
+#define FILE_AI_HUMAN_DETECTION         "/tmp/onvif_notify_server/human_detection"
+#define FILE_AI_VEHICLE_DETECTION       "/tmp/onvif_notify_server/vehicle_detection"
+#define FILE_AI_ANIMAL_DETECTION        "/tmp/onvif_notify_server/animal_detection"
+#define FILE_BABY_CRYING                "/tmp/onvif_notify_server/baby_crying"
+#define FILE_SOUND_DETECTION            "/tmp/onvif_notify_server/sound_detection"
+
+typedef enum
+{
+    IPC_MSG_UNRECOGNIZED,
+    IPC_MSG_MOTION_START,
+    IPC_MSG_MOTION_START_C,
+    IPC_MSG_MOTION_STOP,
+    IPC_MSG_AI_HUMAN_DETECTION,
+    IPC_MSG_AI_VEHICLE_DETECTION,
+    IPC_MSG_AI_ANIMAL_DETECTION,
+    IPC_MSG_BABY_CRYING,
+    IPC_MSG_SOUND_DETECTION,
+    IPC_MSG_COMMAND,
+    IPC_MSG_LAST
+} IPC_MESSAGE_TYPE;
+
+int ipc_init();
+void ipc_stop();
+static int open_queue();
+static int clear_queue();
+static void handle_ipc_unrecognized();
+static void handle_ipc_motion_generic(int detect);
+int ipc_set_callback(IPC_MESSAGE_TYPE type, void (*f)());
+static void call_callback(IPC_MESSAGE_TYPE type);
+int parse_message(char *msg, ssize_t len);
+int daemonize(int flags);
+int check_pid(char *file_name);
+int create_pid(char *file_name);
+void signal_handler(int signal);
+void *sound_stop_thread(void *arg);
+void process_event(int *alarm);
+void callback_motion_generic(void *arg);
+void print_usage(char *progname);
+
+#endif //IPC2FILE_H

From 39f67ceff660693982b7c9748e8dfb81dc0bfcd1 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Thu, 25 Jan 2024 14:13:03 +0100
Subject: [PATCH 50/81] Add configuration file editing

---
 src/mqtt-config/mqtt-config/config.c      | 84 +++++++++++++++++++++++
 src/mqtt-config/mqtt-config/config.h      |  1 +
 src/mqtt-config/mqtt-config/mqtt-config.c |  5 ++
 3 files changed, 90 insertions(+)

diff --git a/src/mqtt-config/mqtt-config/config.c b/src/mqtt-config/mqtt-config/config.c
index 1e02ee1..66eeb06 100644
--- a/src/mqtt-config/mqtt-config/config.c
+++ b/src/mqtt-config/mqtt-config/config.c
@@ -2,6 +2,24 @@
 
 void (*fconf_handler)(const char* key, const char* value);
 
+void ucase(char *string) {
+    // Convert to upper case
+    char *s = string;
+    while (*s) {
+        *s = toupper((unsigned char) *s);
+        s++;
+    }
+}
+
+void lcase(char *string) {
+    // Convert to lower case
+    char *s = string;
+    while (*s) {
+        *s = tolower((unsigned char) *s);
+        s++;
+    }
+}
+
 void config_set_handler(void (*f)(const char* key, const char* value))
 {
     if (f != NULL)
@@ -30,6 +48,72 @@ void config_parse(FILE *fp)
     }
 }
 
+void config_replace(char *filename, char *key, char *value)
+{
+    char buf[MAX_LINE_LENGTH];
+    char oldkey[128];
+    char oldvalue[128];
+    char *line;
+    int parsed;
+    FILE *fps, *fpt;
+    char tmpFile[L_tmpnam + 1]; // Add +1 for the null character. 
+
+    lcase(filename);
+    ucase(key);
+
+    fps = fopen(filename, "r");
+    if (fps == NULL) {
+        printf("Can't open file \"%s\": %s\n", filename, strerror(errno));
+        return;
+    }
+
+    tmpnam(tmpFile);
+    fpt = fopen(tmpFile, "w");
+    if (fpt == NULL) {
+        printf("Can't open file \"%s\": %s\n", filename, strerror(errno));
+        return;
+    }
+
+    while (!feof(fps)) {
+        line = fgets(buf, MAX_LINE_LENGTH, fps);
+        if (line == NULL) break;
+        if (buf[0] != '#') {
+            parsed = sscanf(buf, "%[^=] = %s", oldkey, oldvalue);
+            if((parsed == 2) && (strcasecmp(key, oldkey) == 0)) {
+                sprintf(buf, "%s=%s\n", key, value);
+            }
+        }
+        fputs(buf, fpt);
+    }
+
+    fclose(fpt);
+    fclose(fps);
+
+    // Rename file (rename function is a cross-device link)
+    fps = fopen(filename, "w");
+    if (fps == NULL) {
+        printf("Can't open file \"%s\": %s\n", filename, strerror(errno));
+        return;
+    }
+
+    fpt = fopen(tmpFile, "r");
+    if (fpt == NULL) {
+        printf("Can't open file \"%s\": %s\n", filename, strerror(errno));
+        return;
+    }
+
+    while (!feof(fpt)) {
+        line = fgets(buf, MAX_LINE_LENGTH, fpt);
+        if (line == NULL) break;
+        fputs(buf, fps);
+    }
+
+    fclose(fpt);
+    fclose(fps);
+
+    remove(tmpFile);
+}
+
 FILE *open_conf_file(const char* filename)
 {
     FILE *fp;
diff --git a/src/mqtt-config/mqtt-config/config.h b/src/mqtt-config/mqtt-config/config.h
index cc0a9e5..cb070a4 100644
--- a/src/mqtt-config/mqtt-config/config.h
+++ b/src/mqtt-config/mqtt-config/config.h
@@ -11,5 +11,6 @@
 
 void config_set_handler(void (*f)(const char* key, const char* value));
 void config_parse(FILE *fp);
+void config_replace(char *filename, char *key, char *value);
 FILE *open_conf_file(const char* filename);
 void close_conf_file(FILE *fp);
diff --git a/src/mqtt-config/mqtt-config/mqtt-config.c b/src/mqtt-config/mqtt-config/mqtt-config.c
index 04e511c..50ebec3 100644
--- a/src/mqtt-config/mqtt-config/mqtt-config.c
+++ b/src/mqtt-config/mqtt-config/mqtt-config.c
@@ -60,6 +60,7 @@ void disconnect_callback(struct mosquitto *mosq, void *obj, int result)
 void message_callback(struct mosquitto *mosq, void *obj, const struct mosquitto_message *message)
 {
     char topic_prefix[MAX_LINE_LENGTH], topic[MAX_LINE_LENGTH], file[MAX_KEY_LENGTH], param[MAX_KEY_LENGTH];
+    char conf_file[256];
     char *slash;
     bool match = 0;
     int len;
@@ -148,6 +149,10 @@ void message_callback(struct mosquitto *mosq, void *obj, const struct mosquitto_
                 sprintf(cmd_line, "ipc_cmd %s %s", ipc_cmd_param, (char *) message->payload);
                 if (debug) printf("Running system command \"%s\"\n", cmd_line);
                 system(cmd_line);
+            } else {
+                sprintf(conf_file, "%s/%s.conf", CONF_FILE_PATH, file);
+                if (debug) fprintf(stderr, "Updating file \"%s\", parameter \"%s\" with value \"%s\"\n", file, param, (char *) message->payload);
+                config_replace(conf_file, param, message->payload);
             }
         }
     } else {

From 6a15142aecff7840341c7d41b71f09c58ce919b0 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Thu, 25 Jan 2024 14:13:17 +0100
Subject: [PATCH 51/81] Add new parameters

---
 src/mqtt-config/mqtt-config/validate.c | 13 +++++++++++++
 src/mqtt-config/mqtt-config/validate.h |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/mqtt-config/mqtt-config/validate.c b/src/mqtt-config/mqtt-config/validate.c
index 694757e..b3271de 100644
--- a/src/mqtt-config/mqtt-config/validate.c
+++ b/src/mqtt-config/mqtt-config/validate.c
@@ -18,15 +18,21 @@ char *config_params[PARAM_NUM][PARAM_OPTIONS] = {
     { "system", "SNAPSHOT", "bool", "", "", "" , "", "", "" },
     { "system", "SNAPSHOT_VIDEO", "bool", "", "", "" , "", "", "" },
     { "system", "SNAPSHOT_LOW", "bool", "", "", "" , "", "", "" },
+    { "system", "TIMELAPSE", "bool", "", "", "" , "", "", "" },
+    { "system", "TIMELAPSE_FTP", "bool", "", "", "" , "", "", "" },
+    { "system", "TIMELAPSE_DT", "int", "1", "1440", "" , "", "", "" },
+    { "system", "TIMELAPSE_VDT", "string", "1", "1440", "" , "", "", "" },
     { "system", "ONVIF", "bool", "", "", "" , "", "", "" },
     { "system", "ONVIF_WSDD", "bool", "", "", "" , "", "", "" },
     { "system", "ONVIF_PROFILE", "enum", "high", "low", "both" , "", "", "" },
     { "system", "ONVIF_WM_SNAPSHOT", "bool", "", "", "" , "", "", "" },
     { "system", "ONVIF_NETIF", "string", "", "", "" , "", "", "" },
+    { "system", "TIME_OSD", "bool", "", "", "" , "", "", "" },
     { "system", "NTPD", "bool", "", "", "" , "", "", "" },
     { "system", "NTP_SERVER", "string" "", "", "" , "", "", "" },
     { "system", "PROXYCHAINSNG", "bool", "", "", "" , "", "", "" },
     { "system", "SWAP_FILE", "bool", "", "", "" , "", "", "" },
+    { "system", "SWAP_SWAPPINESS", "int", "0", "100", "" , "", "", "" },
     { "system", "RTSP_PORT", "int", "1", "65535", "" , "", "", "" },
     { "system", "ONVIF_PORT", "int", "1", "65535", "" , "", "", "" },
     { "system", "HTTPD_PORT", "int", "1", "65535", "" , "", "", "" },
@@ -43,6 +49,7 @@ char *config_params[PARAM_NUM][PARAM_OPTIONS] = {
     { "system", "FTP_FILE_DELETE_AFTER_UPLOAD", "bool", "", "", "" , "", "", "" },
     { "system", "SSH_PASSWORD", "string", "", "", "" , "", "", "" },
     { "system", "CRONTAB", "string", "", "", "" , "", "", "" },
+    { "system", "DEBUG_LOG", "bool", "", "", "" , "", "", "" },
 
     { "camera", "SWITCH_ON", "bool", "", "", "" , "", "", "-t" },
     { "camera", "SAVE_VIDEO_ON_MOTION", "bool", "", "", "" , "", "", "-v" },
@@ -60,6 +67,12 @@ char *config_params[PARAM_NUM][PARAM_OPTIONS] = {
     { "camera", "SOUND_SENSITIVITY", "int", "30", "90", "", "", "", "-n" },
     { "camera", "MOTION_TRACKING", "bool", "", "", "", "", "", "-o" },
     { "camera", "CRUISE", "enum", "no", "presets", "360", "", "", "-C" }
+
+    { "ptz", "MOVE", "enum", "right", "left", "down", "up", "stop", "QUERY_STRING=\"action=step&dir=%s\" /home/yi-hack/www/cgi-bin/ptz.sh" },
+    { "ptz", "GOTO_PRESET", "int", "0", "7", "", "", "", "/home/yi-hack/script/ptz_presets.sh -a go_preset -n %s" },
+    { "ptz", "ADD_PRESET", "string", "", "", "", "", "", "/home/yi-hack/script/ptz_presets.sh -a add_preset -m %s" },
+    { "ptz", "SET_HOME_POSITION", "string", "", "", "", "", "", "/home/yi-hack/script/ptz_presets.sh -a set_home_position" },
+    { "ptz", "REMOVE_PRESET", "int", "0", "7", "", "", "", "/home/yi-hack/script/ptz_presets.sh -a del_preset -n %s" },
 };
 
 int validate_param(char *file, char *key, char *value)
diff --git a/src/mqtt-config/mqtt-config/validate.h b/src/mqtt-config/mqtt-config/validate.h
index 747b981..e08d172 100644
--- a/src/mqtt-config/mqtt-config/validate.h
+++ b/src/mqtt-config/mqtt-config/validate.h
@@ -6,7 +6,7 @@
 
 #define PARAM_SIZE    128
 #define PARAM_OPTIONS 9
-#define PARAM_NUM     58
+#define PARAM_NUM     70
 
 int validate_param(char *file, char *key, char *value);
 int extract_param(char *param, char *file, char *key, int index);

From 2fb0fbe9fe1fba0e5ddb7dba2d8737cf5b9f5262 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Thu, 25 Jan 2024 14:15:22 +0100
Subject: [PATCH 52/81] Use generic command for ipc_cmd

---
 src/mqtt-config/mqtt-config/mqtt-config.c |  2 +-
 src/mqtt-config/mqtt-config/validate.c    | 32 +++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/mqtt-config/mqtt-config/mqtt-config.c b/src/mqtt-config/mqtt-config/mqtt-config.c
index 50ebec3..b928620 100644
--- a/src/mqtt-config/mqtt-config/mqtt-config.c
+++ b/src/mqtt-config/mqtt-config/mqtt-config.c
@@ -146,7 +146,7 @@ void message_callback(struct mosquitto *mosq, void *obj, const struct mosquitto_
         // Check if we need to run ipc_cmd
         if (extract_param(ipc_cmd_param, file, param, 8) == 0) {
             if (ipc_cmd_param[0] != '\0') {
-                sprintf(cmd_line, "ipc_cmd %s %s", ipc_cmd_param, (char *) message->payload);
+                sprintf(cmd_line, ipc_cmd_param, (char *) message->payload);
                 if (debug) printf("Running system command \"%s\"\n", cmd_line);
                 system(cmd_line);
             } else {
diff --git a/src/mqtt-config/mqtt-config/validate.c b/src/mqtt-config/mqtt-config/validate.c
index b3271de..728a2af 100644
--- a/src/mqtt-config/mqtt-config/validate.c
+++ b/src/mqtt-config/mqtt-config/validate.c
@@ -51,22 +51,22 @@ char *config_params[PARAM_NUM][PARAM_OPTIONS] = {
     { "system", "CRONTAB", "string", "", "", "" , "", "", "" },
     { "system", "DEBUG_LOG", "bool", "", "", "" , "", "", "" },
 
-    { "camera", "SWITCH_ON", "bool", "", "", "" , "", "", "-t" },
-    { "camera", "SAVE_VIDEO_ON_MOTION", "bool", "", "", "" , "", "", "-v" },
-    { "camera", "MOTION_DETECTION", "bool", "", "", "" , "", "", "-O" },
-    { "camera", "SENSITIVITY", "enum", "low", "medium", "high" , "", "", "-s" },
-    { "camera", "AI_HUMAN_DETECTION", "bool", "", "", "" , "", "", "-a" },
-    { "camera", "AI_VEHICLE_DETECTION", "bool", "", "", "" , "", "", "-E" },
-    { "camera", "AI_ANIMAL_DETECTION", "bool", "", "", "" , "", "", "-N" },
-    { "camera", "FACE_DETECTION", "bool", "", "", "" , "", "", "-c" },
-    { "camera", "BABY_CRYING_DETECT", "bool", "", "", "" , "", "", "-B" },
-    { "camera", "LED", "bool", "", "", "" , "", "", "-l" },
-    { "camera", "ROTATE", "bool", "", "", "" , "", "", "-r" },
-    { "camera", "IR", "bool", "", "", "", "", "", "-i" },
-    { "camera", "SOUND_DETECTION", "bool", "", "", "", "", "", "-b" },
-    { "camera", "SOUND_SENSITIVITY", "int", "30", "90", "", "", "", "-n" },
-    { "camera", "MOTION_TRACKING", "bool", "", "", "", "", "", "-o" },
-    { "camera", "CRUISE", "enum", "no", "presets", "360", "", "", "-C" }
+    { "camera", "SWITCH_ON", "bool", "", "", "" , "", "", "ipc_cmd -t %s" },
+    { "camera", "SAVE_VIDEO_ON_MOTION", "bool", "", "", "" , "", "", "ipc_cmd -v %s" },
+    { "camera", "MOTION_DETECTION", "bool", "", "", "" , "", "", "ipc_cmd -O %s" },
+    { "camera", "SENSITIVITY", "enum", "low", "medium", "high" , "", "", "ipc_cmd -s %s" },
+    { "camera", "AI_HUMAN_DETECTION", "bool", "", "", "" , "", "", "ipc_cmd -a %s" },
+    { "camera", "AI_VEHICLE_DETECTION", "bool", "", "", "" , "", "", "ipc_cmd -E %s" },
+    { "camera", "AI_ANIMAL_DETECTION", "bool", "", "", "" , "", "", "ipc_cmd -N %s" },
+    { "camera", "FACE_DETECTION", "bool", "", "", "" , "", "", "ipc_cmd -c %s" },
+    { "camera", "BABY_CRYING_DETECT", "bool", "", "", "" , "", "", "ipc_cmd -B %s" },
+    { "camera", "LED", "bool", "", "", "" , "", "", "ipc_cmd -l %s" },
+    { "camera", "ROTATE", "bool", "", "", "" , "", "", "ipc_cmd -r %s" },
+    { "camera", "IR", "bool", "", "", "", "", "", "ipc_cmd -i %s" },
+    { "camera", "SOUND_DETECTION", "bool", "", "", "", "", "", "ipc_cmd -b %s" },
+    { "camera", "SOUND_SENSITIVITY", "int", "30", "90", "", "", "", "ipc_cmd -n %s" },
+    { "camera", "MOTION_TRACKING", "bool", "", "", "", "", "", "ipc_cmd -o %s" },
+    { "camera", "CRUISE", "enum", "no", "presets", "360", "", "", "ipc_cmd -C %s" },
 
     { "ptz", "MOVE", "enum", "right", "left", "down", "up", "stop", "QUERY_STRING=\"action=step&dir=%s\" /home/yi-hack/www/cgi-bin/ptz.sh" },
     { "ptz", "GOTO_PRESET", "int", "0", "7", "", "", "", "/home/yi-hack/script/ptz_presets.sh -a go_preset -n %s" },

From 677e5e3006ac647f756be774a92db76ef77d150d Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Thu, 25 Jan 2024 17:40:24 +0100
Subject: [PATCH 53/81] Add onvif_simple_server submodule

---
 .gitmodules                                   |  3 +
 src/onvif_simple_server/.gitignore            |  5 ++
 .../cleanup.onvif_simple_server               | 13 +++++
 .../compile.onvif_simple_server               | 56 +++++++++++++++++++
 .../init.onvif_simple_server                  | 20 +++++++
 .../install.onvif_simple_server               |  9 +++
 src/onvif_simple_server/onvif_simple_server   |  1 +
 src/onvif_simple_server/path.patch            | 45 +++++++++++++++
 8 files changed, 152 insertions(+)
 create mode 100644 src/onvif_simple_server/.gitignore
 create mode 100755 src/onvif_simple_server/cleanup.onvif_simple_server
 create mode 100755 src/onvif_simple_server/compile.onvif_simple_server
 create mode 100755 src/onvif_simple_server/init.onvif_simple_server
 create mode 100755 src/onvif_simple_server/install.onvif_simple_server
 create mode 160000 src/onvif_simple_server/onvif_simple_server
 create mode 100644 src/onvif_simple_server/path.patch

diff --git a/.gitmodules b/.gitmodules
index c2afc4d..42899d0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -42,3 +42,6 @@
 	path = src/curl/curl
 	url = https://github.com/curl/curl
 	ignore = dirty
+[submodule "src/onvif_simple_server/onvif_simple_server"]
+	path = src/onvif_simple_server/onvif_simple_server
+	url = https://github.com/roleoroleo/onvif_simple_server
diff --git a/src/onvif_simple_server/.gitignore b/src/onvif_simple_server/.gitignore
new file mode 100644
index 0000000..bd9de20
--- /dev/null
+++ b/src/onvif_simple_server/.gitignore
@@ -0,0 +1,5 @@
+# Ignore the install dir
+_install/
+*.xz
+libtomcrypt*/
+onvif_simple_server/onvif_simple_server
diff --git a/src/onvif_simple_server/cleanup.onvif_simple_server b/src/onvif_simple_server/cleanup.onvif_simple_server
new file mode 100755
index 0000000..733f138
--- /dev/null
+++ b/src/onvif_simple_server/cleanup.onvif_simple_server
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+cd $SCRIPT_DIR
+
+cd onvif_simple_server
+
+make clean
+
+cd ..
+
+rm -rf libtomcrypt*
+rm crypt*.tar.xz
diff --git a/src/onvif_simple_server/compile.onvif_simple_server b/src/onvif_simple_server/compile.onvif_simple_server
new file mode 100755
index 0000000..21f800d
--- /dev/null
+++ b/src/onvif_simple_server/compile.onvif_simple_server
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+export CROSSPATH=/opt/arm-hisiv300-linux/bin
+export PATH=${PATH}:${CROSSPATH}
+
+export TARGET=arm-hisiv300-linux-uclibcgnueabi
+export CROSS=arm-hisiv300-linux-uclibcgnueabi
+export BUILD=x86_64-pc-linux-gnu
+
+export CROSSPREFIX=${CROSS}-
+
+export STRIP=${CROSSPREFIX}strip
+export CXX=${CROSSPREFIX}g++
+export CC=${CROSSPREFIX}gcc
+export LD=${CROSSPREFIX}ld
+export AS=${CROSSPREFIX}as
+export AR=${CROSSPREFIX}ar
+
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+cd $SCRIPT_DIR
+
+cd libtomcrypt-1.18.2
+#make clean
+CFLAGS="-DLTC_NOTHING -DLTC_SHA1 -DLTC_BASE64 -ffunction-sections -fdata-sections" LDFLAGS="-Wl,--gc-sections" make
+cd ..
+
+cd onvif_simple_server || exit 1
+
+#make clean
+CFLAGS="-std=c99"
+make || exit 1
+
+mkdir -p ../_install/www/onvif || exit 1
+mkdir -p ../_install/bin || exit 1
+mkdir -p ../_install/etc/onvif_notify_server || exit 1
+mkdir -p ../_install/etc/wsd_simple_server || exit 1
+
+cp ./onvif_simple_server ../_install/www/onvif || exit 1
+ln -s onvif_simple_server ../_install/www/onvif/device_service
+ln -s onvif_simple_server ../_install/www/onvif/events_service
+ln -s onvif_simple_server ../_install/www/onvif/media_service
+ln -s onvif_simple_server ../_install/www/onvif/ptz_service
+cp -R ./device_service_files ../_install/www/onvif
+cp -R ./events_service_files ../_install/www/onvif
+cp -R ./generic_files ../_install/www/onvif
+cp -R ./media_service_files ../_install/www/onvif
+cp -R ./ptz_service_files ../_install/www/onvif
+
+cp ./onvif_notify_server ../_install/bin || exit 1
+cp -R ./notify_files/* ../_install/etc/onvif_notify_server
+
+cp ./wsd_simple_server ../_install/bin || exit 1
+cp -R ./wsd_files/* ../_install/etc/wsd_simple_server
+
+${STRIP} ../_install/bin/* || exit 1
+${STRIP} ../_install/www/onvif/onvif_simple_server || exit 1
diff --git a/src/onvif_simple_server/init.onvif_simple_server b/src/onvif_simple_server/init.onvif_simple_server
new file mode 100755
index 0000000..844f5dc
--- /dev/null
+++ b/src/onvif_simple_server/init.onvif_simple_server
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+cd $SCRIPT_DIR
+
+rm -rf ./_install
+
+if [ ! -f crypt-1.18.2.tar.xz ]; then
+    wget https://github.com/libtom/libtomcrypt/releases/download/v1.18.2/crypt-1.18.2.tar.xz
+fi
+tar Jxvf ./crypt-1.18.2.tar.xz
+if [ ! -L onvif_simple_server/extras/libtomcrypt ]; then
+    ln -s ../../libtomcrypt-1.18.2 onvif_simple_server/extras/libtomcrypt
+fi
+
+cd onvif_simple_server
+
+git reset --hard
+
+patch -p1 < ../path.patch
diff --git a/src/onvif_simple_server/install.onvif_simple_server b/src/onvif_simple_server/install.onvif_simple_server
new file mode 100755
index 0000000..9d6841b
--- /dev/null
+++ b/src/onvif_simple_server/install.onvif_simple_server
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(cd `dirname $0` && pwd)
+cd $SCRIPT_DIR
+
+mkdir -p ../../build/home/yi-hack/www/onvif || exit 1
+mkdir -p ../../build/home/yi-hack/bin/ || exit 1
+
+rsync -av ./_install/* ../../build/home/yi-hack/ || exit 1
diff --git a/src/onvif_simple_server/onvif_simple_server b/src/onvif_simple_server/onvif_simple_server
new file mode 160000
index 0000000..ae40434
--- /dev/null
+++ b/src/onvif_simple_server/onvif_simple_server
@@ -0,0 +1 @@
+Subproject commit ae40434ffbb67d3ecda9dfa02cf7abd1cd4b2a9b
diff --git a/src/onvif_simple_server/path.patch b/src/onvif_simple_server/path.patch
new file mode 100644
index 0000000..b69e94b
--- /dev/null
+++ b/src/onvif_simple_server/path.patch
@@ -0,0 +1,45 @@
+diff -Naur onvif_simple_server.ori/onvif_notify_server.c onvif_simple_server/onvif_notify_server.c
+--- onvif_simple_server.ori/onvif_notify_server.c	2023-12-09 22:58:35.403631631 +0100
++++ onvif_simple_server/onvif_notify_server.c	2023-12-09 22:59:34.011730308 +0100
+@@ -39,10 +39,10 @@
+ #include "log.h"
+ #include "onvif_simple_server.h"
+ 
+-#define DEFAULT_CONF_FILE "/etc/onvif_simple_server.conf"
+-#define DEFAULT_LOG_FILE "/var/log/onvif_notify_server.log"
++#define DEFAULT_CONF_FILE "/tmp/onvif_simple_server.conf"
++#define DEFAULT_LOG_FILE "/tmp/onvif_notify_server.log"
+ #define DEFAULT_PID_FILE "/var/run/onvif_notify_server.pid"
+-#define TEMPLATE_DIR "/etc/onvif_notify_server"
++#define TEMPLATE_DIR "/tmp/sd/yi-hack-v5/etc/onvif_notify_server"
+ #define INOTIFY_DIR "/tmp/onvif_notify_server"
+ 
+ #define ALARM_OFF 0
+diff -Naur onvif_simple_server.ori/onvif_simple_server.c onvif_simple_server/onvif_simple_server.c
+--- onvif_simple_server.ori/onvif_simple_server.c	2023-12-09 22:57:18.935503114 +0100
++++ onvif_simple_server/onvif_simple_server.c	2023-12-09 23:00:26.871819429 +0100
+@@ -36,8 +36,8 @@
+ #include "utils.h"
+ #include "log.h"
+ 
+-#define DEFAULT_CONF_FILE "/etc/onvif_simple_server.conf"
+-#define DEFAULT_LOG_FILE "/var/log/onvif_simple_server.log"
++#define DEFAULT_CONF_FILE "/tmp/onvif_simple_server.conf"
++#define DEFAULT_LOG_FILE "/tmp/onvif_simple_server.log"
+ #define DEBUG_FILE "/tmp/onvif_simple_server.debug"
+ 
+ #define ROTATION_LOG_LENGTH 3
+diff -Naur onvif_simple_server.ori/wsd_simple_server.c onvif_simple_server/wsd_simple_server.c
+--- onvif_simple_server.ori/wsd_simple_server.c	2023-12-09 22:57:18.935503114 +0100
++++ onvif_simple_server/wsd_simple_server.c	2023-12-09 23:01:06.899886974 +0100
+@@ -38,8 +38,8 @@
+ #define PORT 3702
+ #define TYPE "NetworkVideoTransmitter"
+ 
+-#define DEFAULT_LOG_FILE "/var/log/wsd_simple_server.log"
+-#define TEMPLATE_DIR "/etc/wsd_simple_server"
++#define DEFAULT_LOG_FILE "/tmp/wsd_simple_server.log"
++#define TEMPLATE_DIR "/tmp/sd/yi-hack-v5/etc/wsd_simple_server"
+ 
+ #define RECV_BUFFER_LEN 4096
+ 

From f42d514c7265b662f1912949c7b94b33ef62d8e0 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Thu, 25 Jan 2024 22:08:45 +0100
Subject: [PATCH 54/81] Patch httpd to run onvif as a cgi

---
 src/busybox/init.busybox |  2 ++
 src/busybox/onvif.patch  | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 src/busybox/onvif.patch

diff --git a/src/busybox/init.busybox b/src/busybox/init.busybox
index 5d8fe89..c424e87 100755
--- a/src/busybox/init.busybox
+++ b/src/busybox/init.busybox
@@ -8,5 +8,7 @@ rm -rf ./_install
 cd busybox 
 git reset --hard || exit 1
 
+patch -p1 < ../onvif.patch
+
 cp ../.config ./ || exit 1
 
diff --git a/src/busybox/onvif.patch b/src/busybox/onvif.patch
new file mode 100644
index 0000000..5a4e2c2
--- /dev/null
+++ b/src/busybox/onvif.patch
@@ -0,0 +1,17 @@
+diff -Naur busybox.ori/networking/httpd.c busybox/networking/httpd.c
+--- busybox.ori/networking/httpd.c	2024-01-25 11:34:58.935415874 +0100
++++ busybox/networking/httpd.c	2024-01-25 21:14:16.277287558 +0100
+@@ -2316,6 +2316,13 @@
+ 		}
+ 		cgi_type = CGI_NORMAL;
+ 	}
++	else if (is_prefixed_with(tptr, "onvif/")) {
++		if (tptr[6] == '\0') {
++			/* protect listing "cgi-bin/" */
++			send_headers_and_exit(HTTP_FORBIDDEN);
++		}
++		cgi_type = CGI_NORMAL;
++	}
+ #endif
+ 
+ 	if (urlp[-1] == '/') {

From e258274218c85f064b925c9e481c911d7fb8451e Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Fri, 26 Jan 2024 12:41:01 +0100
Subject: [PATCH 55/81] Remove onvif_srvd and add onvif_simple_server sharing
 port 80 with httpd

---
 src/mqtt-config/mqtt-config/validate.c        |    1 -
 src/mqtt-config/mqtt-config/validate.h        |    2 +-
 src/onvif_srvd/.gitignore                     |   18 -
 src/onvif_srvd/Makefile.onvif_srvd            |  325 -
 src/onvif_srvd/cleanup.onvif_srvd             |   12 -
 src/onvif_srvd/compile.onvif_srvd             |   21 -
 src/onvif_srvd/init.onvif_srvd                |   13 -
 src/onvif_srvd/install.onvif_srvd             |    8 -
 src/onvif_srvd/onvif_srvd/LICENSE             |   30 -
 src/onvif_srvd/onvif_srvd/Makefile            |  325 -
 src/onvif_srvd/onvif_srvd/README.md           |  121 -
 .../onvif_srvd/src/ServiceContext.cpp         |  500 -
 .../onvif_srvd/src/ServiceContext.h           |  193 -
 .../onvif_srvd/src/ServiceDevice.cpp          |  841 --
 .../onvif_srvd/src/ServiceMedia.cpp           |  885 --
 src/onvif_srvd/onvif_srvd/src/ServicePTZ.cpp  |  449 -
 src/onvif_srvd/onvif_srvd/src/daemon.c        |  289 -
 src/onvif_srvd/onvif_srvd/src/daemon.h        |  107 -
 .../onvif_srvd/src/eth_dev_param.cpp          |  519 -
 src/onvif_srvd/onvif_srvd/src/eth_dev_param.h |  104 -
 src/onvif_srvd/onvif_srvd/src/onvif_srvd.cpp  |  539 -
 src/onvif_srvd/onvif_srvd/src/smacros.h       |  199 -
 src/onvif_srvd/onvif_srvd/src/stools.h        |   26 -
 .../onvif_srvd/start_scripts/S90onvif_srvd    |   63 -
 .../start_scripts/onvif_srvd.service          |   31 -
 src/onvif_srvd/onvif_srvd/wsdl/b-2.xsd        |  580 --
 src/onvif_srvd/onvif_srvd/wsdl/bf-2.xsd       |   85 -
 src/onvif_srvd/onvif_srvd/wsdl/common.xsd     |  161 -
 .../onvif_srvd/wsdl/devicemgmt.wsdl           | 4207 --------
 src/onvif_srvd/onvif_srvd/wsdl/media.wsdl     | 3687 -------
 src/onvif_srvd/onvif_srvd/wsdl/onvif.xsd      | 8822 -----------------
 src/onvif_srvd/onvif_srvd/wsdl/ptz.wsdl       | 1292 ---
 src/onvif_srvd/onvif_srvd/wsdl/t-1.xsd        |  185 -
 src/onvif_srvd/onvif_srvd/wsdl/typemap.dat    |  539 -
 .../static/home/yi-hack-v5/etc/system.conf    |    3 +-
 .../home/yi-hack-v5/script/check_conf.sh      |    3 +-
 .../static/home/yi-hack-v5/script/system.sh   |  111 +-
 src/www/httpd/cgi-bin/links.sh                |    2 +-
 src/www/httpd/cgi-bin/service.sh              |  140 +-
 .../httpd/htdocs/js/modules/configurations.js |    3 +-
 .../httpd/htdocs/pages/configurations.html    |   11 +-
 41 files changed, 209 insertions(+), 25243 deletions(-)
 delete mode 100644 src/onvif_srvd/.gitignore
 delete mode 100644 src/onvif_srvd/Makefile.onvif_srvd
 delete mode 100755 src/onvif_srvd/cleanup.onvif_srvd
 delete mode 100755 src/onvif_srvd/compile.onvif_srvd
 delete mode 100755 src/onvif_srvd/init.onvif_srvd
 delete mode 100755 src/onvif_srvd/install.onvif_srvd
 delete mode 100644 src/onvif_srvd/onvif_srvd/LICENSE
 delete mode 100644 src/onvif_srvd/onvif_srvd/Makefile
 delete mode 100644 src/onvif_srvd/onvif_srvd/README.md
 delete mode 100644 src/onvif_srvd/onvif_srvd/src/ServiceContext.cpp
 delete mode 100644 src/onvif_srvd/onvif_srvd/src/ServiceContext.h
 delete mode 100644 src/onvif_srvd/onvif_srvd/src/ServiceDevice.cpp
 delete mode 100644 src/onvif_srvd/onvif_srvd/src/ServiceMedia.cpp
 delete mode 100644 src/onvif_srvd/onvif_srvd/src/ServicePTZ.cpp
 delete mode 100644 src/onvif_srvd/onvif_srvd/src/daemon.c
 delete mode 100644 src/onvif_srvd/onvif_srvd/src/daemon.h
 delete mode 100644 src/onvif_srvd/onvif_srvd/src/eth_dev_param.cpp
 delete mode 100644 src/onvif_srvd/onvif_srvd/src/eth_dev_param.h
 delete mode 100644 src/onvif_srvd/onvif_srvd/src/onvif_srvd.cpp
 delete mode 100644 src/onvif_srvd/onvif_srvd/src/smacros.h
 delete mode 100644 src/onvif_srvd/onvif_srvd/src/stools.h
 delete mode 100755 src/onvif_srvd/onvif_srvd/start_scripts/S90onvif_srvd
 delete mode 100644 src/onvif_srvd/onvif_srvd/start_scripts/onvif_srvd.service
 delete mode 100644 src/onvif_srvd/onvif_srvd/wsdl/b-2.xsd
 delete mode 100644 src/onvif_srvd/onvif_srvd/wsdl/bf-2.xsd
 delete mode 100644 src/onvif_srvd/onvif_srvd/wsdl/common.xsd
 delete mode 100644 src/onvif_srvd/onvif_srvd/wsdl/devicemgmt.wsdl
 delete mode 100644 src/onvif_srvd/onvif_srvd/wsdl/media.wsdl
 delete mode 100644 src/onvif_srvd/onvif_srvd/wsdl/onvif.xsd
 delete mode 100644 src/onvif_srvd/onvif_srvd/wsdl/ptz.wsdl
 delete mode 100644 src/onvif_srvd/onvif_srvd/wsdl/t-1.xsd
 delete mode 100644 src/onvif_srvd/onvif_srvd/wsdl/typemap.dat

diff --git a/src/mqtt-config/mqtt-config/validate.c b/src/mqtt-config/mqtt-config/validate.c
index 728a2af..dbe620d 100644
--- a/src/mqtt-config/mqtt-config/validate.c
+++ b/src/mqtt-config/mqtt-config/validate.c
@@ -34,7 +34,6 @@ char *config_params[PARAM_NUM][PARAM_OPTIONS] = {
     { "system", "SWAP_FILE", "bool", "", "", "" , "", "", "" },
     { "system", "SWAP_SWAPPINESS", "int", "0", "100", "" , "", "", "" },
     { "system", "RTSP_PORT", "int", "1", "65535", "" , "", "", "" },
-    { "system", "ONVIF_PORT", "int", "1", "65535", "" , "", "", "" },
     { "system", "HTTPD_PORT", "int", "1", "65535", "" , "", "", "" },
     { "system", "USERNAME", "string", "", "", "" , "", "", "" },
     { "system", "PASSWORD", "string", "", "", "" , "", "", "" },
diff --git a/src/mqtt-config/mqtt-config/validate.h b/src/mqtt-config/mqtt-config/validate.h
index e08d172..0e935c9 100644
--- a/src/mqtt-config/mqtt-config/validate.h
+++ b/src/mqtt-config/mqtt-config/validate.h
@@ -6,7 +6,7 @@
 
 #define PARAM_SIZE    128
 #define PARAM_OPTIONS 9
-#define PARAM_NUM     70
+#define PARAM_NUM     69
 
 int validate_param(char *file, char *key, char *value);
 int extract_param(char *param, char *file, char *key, int index);
diff --git a/src/onvif_srvd/.gitignore b/src/onvif_srvd/.gitignore
deleted file mode 100644
index d6ea4d2..0000000
--- a/src/onvif_srvd/.gitignore
+++ /dev/null
@@ -1,18 +0,0 @@
-# Ignore the install dir
-_install/
-onvif_srvd/.depend
-onvif_srvd/SDK/
-onvif_srvd/generated/
-onvif_srvd/gsoap-2.8/
-onvif_srvd/lib/
-onvif_srvd/onvif_srvd
-onvif_srvd/openssl
-onvif_srvd/openssl-1.0.2u/
-onvif_srvd/src/ServiceContext.o
-onvif_srvd/src/ServiceDevice.o
-onvif_srvd/src/ServiceMedia.o
-onvif_srvd/src/ServicePTZ.o
-onvif_srvd/src/daemon.o
-onvif_srvd/src/eth_dev_param.o
-onvif_srvd/src/onvif_srvd.o
-
diff --git a/src/onvif_srvd/Makefile.onvif_srvd b/src/onvif_srvd/Makefile.onvif_srvd
deleted file mode 100644
index 4c2396d..0000000
--- a/src/onvif_srvd/Makefile.onvif_srvd
+++ /dev/null
@@ -1,325 +0,0 @@
-DAEMON_NAME           = onvif_srvd
-DAEMON_MAJOR_VERSION  = 1
-DAEMON_MINOR_VERSION  = 1
-DAEMON_PATCH_VERSION  = 0
-DAEMON_PID_FILE_NAME  = $(DAEMON_NAME).pid
-DAEMON_LOG_FILE_NAME  = $(DAEMON_NAME).log
-DAEMON_NO_CHDIR       = 1
-DAEMON_NO_CLOSE_STDIO = 0
-
-
-GSOAP_VERSION     = 2.8.92
-GSOAP_INSTALL_DIR = ./gsoap-2.8
-GSOAP_DIR         = $(GSOAP_INSTALL_DIR)/gsoap
-GSOAP_CUSTOM_DIR  = $(GSOAP_DIR)/custom
-GSOAP_PLUGIN_DIR  = $(GSOAP_DIR)/plugin
-GSOAP_IMPORT_DIR  = $(GSOAP_DIR)/import
-OPENSSL_DIR       = ./openssl
-
-
-SOAPCPP2          = $(GSOAP_DIR)/src/soapcpp2
-WSDL2H            = $(GSOAP_DIR)/wsdl/wsdl2h
-GSOAP_CONFIGURE   = --disable-c-locale
-
-
-COMMON_DIR        = ./src
-GENERATED_DIR     = ./generated
-
-
-CXXFLAGS          = -DDAEMON_NAME='"$(DAEMON_NAME)"'
-CXXFLAGS         += -DDAEMON_MAJOR_VERSION=$(DAEMON_MAJOR_VERSION)
-CXXFLAGS         += -DDAEMON_MINOR_VERSION=$(DAEMON_MINOR_VERSION)
-CXXFLAGS         += -DDAEMON_PATCH_VERSION=$(DAEMON_PATCH_VERSION)
-CXXFLAGS         += -DDAEMON_PID_FILE_NAME='"$(DAEMON_PID_FILE_NAME)"'
-CXXFLAGS         += -DDAEMON_LOG_FILE_NAME='"$(DAEMON_LOG_FILE_NAME)"'
-CXXFLAGS         += -DDAEMON_NO_CHDIR=$(DAEMON_NO_CHDIR)
-CXXFLAGS         += -DDAEMON_NO_CLOSE_STDIO=$(DAEMON_NO_CLOSE_STDIO)
-
-CXXFLAGS         += -I$(COMMON_DIR)
-CXXFLAGS         += -I$(GENERATED_DIR)
-CXXFLAGS         += -I$(GSOAP_DIR) -I$(GSOAP_CUSTOM_DIR) -I$(GSOAP_PLUGIN_DIR) -I$(GSOAP_IMPORT_DIR)
-CXXFLAGS         += -std=c++11 -O2  -Wall  -pipe
-CXXFLAGS         += -DWITH_NO_C_LOCALE
-
-CXX              ?= g++
-
-
-
-
-
-# To build a daemon with WS-Security support,
-# call make with the WSSE_ON=1 parameter
-# example:
-# make WSSE_ON=1 all
-ifdef WSSE_ON
-CXXFLAGS        += -DWITH_OPENSSL -I$(OPENSSL_DIR)/include
-LDFLAGS         += openssl/libssl.a openssl/libcrypto.a -ldl
-
-WSSE_SOURCES     = $(GSOAP_PLUGIN_DIR)/wsseapi.c \
-                   $(GSOAP_PLUGIN_DIR)/mecevp.c  \
-                   $(GSOAP_PLUGIN_DIR)/smdevp.c  \
-                   $(GSOAP_PLUGIN_DIR)/wsaapi.c
-
-WSSE_IMPORT      = echo '\#import "wsse.h" ' >> $@
-else
-GSOAP_CONFIGURE += --disable-ssl
-endif
-
-
-
-
-
-
-
-SOAP_SRC = $(GSOAP_DIR)/stdsoap2.cpp        \
-           $(GSOAP_DIR)/dom.cpp             \
-           $(GSOAP_CUSTOM_DIR)/duration.c
-
-
-
-# We can't use wildcard func, this files will be generated
-SOAP_SERVICE_SRC = $(GENERATED_DIR)/soapDeviceBindingService.cpp \
-                   $(GENERATED_DIR)/soapMediaBindingService.cpp  \
-                   $(GENERATED_DIR)/soapPTZBindingService.cpp
-
-
-
-# Add your source files to the list.
-# Supported *.c  *.cpp  *.S files.
-# For other file types write a template rule for build, see below.
-SOURCES  = $(COMMON_DIR)/daemon.c                 \
-           $(COMMON_DIR)/$(DAEMON_NAME).cpp       \
-           $(COMMON_DIR)/eth_dev_param.cpp        \
-           $(COMMON_DIR)/ServiceContext.cpp       \
-           $(COMMON_DIR)/ServiceDevice.cpp        \
-           $(COMMON_DIR)/ServiceMedia.cpp         \
-           $(COMMON_DIR)/ServicePTZ.cpp           \
-           $(GENERATED_DIR)/soapC.cpp             \
-           $(SOAP_SRC)                            \
-           $(SOAP_SERVICE_SRC)                    \
-           $(WSSE_SOURCES)
-
-
-
-
-
-
-OBJECTS  := $(patsubst %.c,  %.o, $(SOURCES) )
-OBJECTS  := $(patsubst %.cpp,%.o, $(OBJECTS) )
-OBJECTS  := $(patsubst %.S,  %.o, $(OBJECTS) )
-
-
-DEBUG_SUFFIX   = debug
-
-DEBUG_OBJECTS := $(patsubst %.o, %_$(DEBUG_SUFFIX).o, $(OBJECTS) )
-
-
-
-
-WSDL_FILES = $(wildcard wsdl/*.wsdl wsdl/*.xsd)
-
-
-
-
-.PHONY: all
-all: debug release
-
-
-
-.PHONY: release
-release: CXXFLAGS := -s  $(CXXFLAGS)
-release: $(DAEMON_NAME)
-
-
-
-.PHONY: debug
-debug: DAEMON_NO_CLOSE_STDIO = 1
-debug: CXXFLAGS := -DDEBUG  -g  $(CXXFLAGS)
-debug: $(DAEMON_NAME)_$(DEBUG_SUFFIX)
-
-
-
-# release
-$(DAEMON_NAME): .depend $(OBJECTS)
-	$(call build_bin, $(OBJECTS))
-
-
-# debug
-$(DAEMON_NAME)_$(DEBUG_SUFFIX): .depend $(DEBUG_OBJECTS)
-	$(call build_bin, $(DEBUG_OBJECTS))
-
-
-
-# Build release objects
-%.o: %.c
-	$(build_object)
-
-
-%.o: %.cpp
-	$(build_object)
-
-
-%.o: %.S
-	$(build_object)
-
-
-
-# Build debug objects
-%_$(DEBUG_SUFFIX).o: %.c
-	$(build_object)
-
-
-%_$(DEBUG_SUFFIX).o: %.cpp
-	$(build_object)
-
-
-%_$(DEBUG_SUFFIX).o: %.S
-	$(build_object)
-
-
-
-.PHONY: clean
-clean:
-	-@rm -f $(DAEMON_NAME)
-	-@rm -f $(DAEMON_NAME)_$(DEBUG_SUFFIX)
-	-@rm -f $(OBJECTS)
-	-@rm -f $(DEBUG_OBJECTS)
-	-@rm -f .depend
-	-@rm -f -d -R $(GENERATED_DIR)
-	-@rm -f *.*~
-
-
-
-.PHONY: distclean
-distclean: clean
-	-@rm -f -d -R SDK
-	-@rm -f -d -R $(GSOAP_INSTALL_DIR)
-	-@rm -f RECV.log SENT.log TEST.log
-
-
-
-
-.depend: $(GENERATED_DIR)/soapC.cpp
-	-@rm -f .depend
-	@echo "Generating dependencies..."
-	@for src in $(SOURCES) ; do \
-        echo "  [depend]  $$src" ; \
-        $(CXX) $(CXXFLAGS) -MT ".depend $${src%.*}.o $${src%.*}_$(DEBUG_SUFFIX).o" -MM $$src >> .depend ; \
-    done
-
-
-
-ifeq "$(findstring $(MAKECMDGOALS),clean distclean)"  ""
-    include $(wildcard .depend)
-endif
-
-
-
-
-
-# ---- gSOAP ----
-
-$(GENERATED_DIR)/onvif.h:
-	@$(build_openssl)
-	@$(build_gsoap)
-	@mkdir -p $(GENERATED_DIR)
-	$(WSDL2H) -d -t ./wsdl/typemap.dat  -o $@  $(WSDL_FILES)
-	$(WSSE_IMPORT)
-
-
-
-$(GENERATED_DIR)/soapC.cpp: $(GENERATED_DIR)/onvif.h
-	$(SOAPCPP2) -j -L -x -S -d $(GENERATED_DIR) -I$(GSOAP_DIR):$(GSOAP_IMPORT_DIR) $<
-
-
-
-# This targets is needed for parallel work of make
-$(OBJECTS) $(DEBUG_OBJECTS) $(SOAP_SRC) $(SOAP_SERVICE_SRC) $(WSSE_SOURCES): $(GENERATED_DIR)/soapC.cpp
-
-
-
-
-# Common commands
-BUILD_ECHO = echo "\n  [build]  $@:"
-
-
-define build_object
-    @$(BUILD_ECHO)
-    $(CXX) -c $< -o $@  $(CXXFLAGS)
-endef
-
-
-
-define build_bin
-    @$(BUILD_ECHO)
-    $(CXX)  $1 -o $@  $(CXXFLAGS) $(LDFLAGS)
-    @echo "\n---- Compiled $@ ver $(DAEMON_MAJOR_VERSION).$(DAEMON_MINOR_VERSION).$(DAEMON_PATCH_VERSION) ----\n"
-endef
-
-
-
-define build_gsoap
-
-    # get archive
-    if [ ! -f SDK/gsoap.zip ]; then \
-        mkdir -p SDK; \
-	wget -O ./SDK/gsoap.zip.tmp "http://dl.t2-project.org/mirror/trunk/g/gsoap_$(GSOAP_VERSION).zip" || \
-        wget -O ./SDK/gsoap.zip.tmp "https://sourceforge.net/projects/gsoap2/files/gsoap-2.8/gsoap_$(GSOAP_VERSION).zip/download"   || \
-        wget -O ./SDK/gsoap.zip.tmp "https://sourceforge.net/projects/gsoap2/files/oldreleases/gsoap_$(GSOAP_VERSION).zip/download" || \
-        wget -O ./SDK/gsoap.zip.tmp "https://master.dl.sourceforge.net/project/gsoap2/oldreleases/gsoap_$(GSOAP_VERSION).zip"       && \
-        mv ./SDK/gsoap.zip.tmp ./SDK/gsoap.zip; \
-    fi
-
-    # unzip
-    if [ ! -f $(GSOAP_INSTALL_DIR)/README.txt ]; then \
-         unzip ./SDK/gsoap.zip; \
-    fi
-
-    # build
-    if [ ! -f $(SOAPCPP2) ] || [ ! -f $(WSDL2H) ]; then \
-         cd $(GSOAP_INSTALL_DIR); \
-         unset CXX && ./configure $(GSOAP_CONFIGURE) && \
-         make -j1; \
-         cd ..;\
-    fi
-endef
-
-
-
-define build_openssl
-
-    # get archive
-    if [ ! -f SDK/openssl.tar.gz ]; then \
-        mkdir -p SDK; \
-        wget -O ./SDK/openssl.tar.gz.tmp "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz" && \
-        mv ./SDK/openssl.tar.gz.tmp ./SDK/openssl.tar.gz; \
-    fi
-
-    # untar
-    if [ ! -f openssl-1.0.2u/README ]; then \
-        tar zxvf ./SDK/openssl.tar.gz; \
-        ln -s openssl-1.0.2u openssl; \
-    fi
-
-    # build
-    if [ ! -f openssl/libcrypto.so.1.0.0 ] || [ ! -f openssl/libssl.so.1.0.0 ]; then \
-        cd openssl; \
-        CC=arm-hisiv300-linux-uclibcgnueabi-gcc ./Configure linux-generic32 && \
-        CC=arm-hisiv300-linux-uclibcgnueabi-gcc make; \
-        cd ..;\
-    fi
-endef
-
-
-
-.PHONY: help
-help:
-	@echo "make [command]"
-	@echo "command is:"
-	@echo "   all       -  build daemon in release and debug mode"
-	@echo "   debug     -  build in debug mode (#define DEBUG 1)"
-	@echo "   release   -  build in release mode (strip)"
-	@echo "   clean     -  remove all generated files"
-	@echo "   distclean -  clean + remove all SDK files"
-	@echo "   help      -  this help"
-
diff --git a/src/onvif_srvd/cleanup.onvif_srvd b/src/onvif_srvd/cleanup.onvif_srvd
deleted file mode 100755
index 89d3530..0000000
--- a/src/onvif_srvd/cleanup.onvif_srvd
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR=$(cd `dirname $0` && pwd)
-cd $SCRIPT_DIR
-
-cd onvif_srvd
-
-make clean
-rm -rf SDK
-rm -rf gsoap-2.8
-rm -rf openssl-1.0.2u
-rm -rf openssl
diff --git a/src/onvif_srvd/compile.onvif_srvd b/src/onvif_srvd/compile.onvif_srvd
deleted file mode 100755
index de487e9..0000000
--- a/src/onvif_srvd/compile.onvif_srvd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-export PATH=${PATH}:/opt/arm-hisiv300-linux/bin
-
-export TARGET=arm-hisiv300-linux-uclibcgnueabi
-export CROSS=arm-hisiv300-linux-uclibcgnueabi
-export BUILD=x86_64-pc-linux-gnu
-
-export CROSSPREFIX=${CROSS}-
-
-export CXX=${CROSSPREFIX}g++
-
-SCRIPT_DIR=$(cd `dirname $0` && pwd)
-cd $SCRIPT_DIR
-
-cd onvif_srvd || exit 1
-
-make clean
-make WSSE_ON=1 release || exit 1
-mkdir -p $SCRIPT_DIR/_install/bin
-cp onvif_srvd $SCRIPT_DIR/_install/bin/
diff --git a/src/onvif_srvd/init.onvif_srvd b/src/onvif_srvd/init.onvif_srvd
deleted file mode 100755
index d6eed52..0000000
--- a/src/onvif_srvd/init.onvif_srvd
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR=$(cd `dirname $0` && pwd)
-cd $SCRIPT_DIR
-
-rm -rf ./_install
-
-cd onvif_srvd || exit 1
-#git reset --hard || exit 1
-
-cd ..
-
-cp Makefile.onvif_srvd onvif_srvd/Makefile
diff --git a/src/onvif_srvd/install.onvif_srvd b/src/onvif_srvd/install.onvif_srvd
deleted file mode 100755
index a00e3c7..0000000
--- a/src/onvif_srvd/install.onvif_srvd
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR=$(cd `dirname $0` && pwd)
-cd $SCRIPT_DIR
-
-mkdir -p ../../build/home/yi-hack-v5/bin/ || exit 1
-
-rsync -a ./_install/bin/onvif_srvd ../../build/home/yi-hack-v5/bin/
diff --git a/src/onvif_srvd/onvif_srvd/LICENSE b/src/onvif_srvd/onvif_srvd/LICENSE
deleted file mode 100644
index 6a3fbb9..0000000
--- a/src/onvif_srvd/onvif_srvd/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2016, Koynov Stas - skojnov@yandex.ru
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/onvif_srvd/onvif_srvd/Makefile b/src/onvif_srvd/onvif_srvd/Makefile
deleted file mode 100644
index 4c2396d..0000000
--- a/src/onvif_srvd/onvif_srvd/Makefile
+++ /dev/null
@@ -1,325 +0,0 @@
-DAEMON_NAME           = onvif_srvd
-DAEMON_MAJOR_VERSION  = 1
-DAEMON_MINOR_VERSION  = 1
-DAEMON_PATCH_VERSION  = 0
-DAEMON_PID_FILE_NAME  = $(DAEMON_NAME).pid
-DAEMON_LOG_FILE_NAME  = $(DAEMON_NAME).log
-DAEMON_NO_CHDIR       = 1
-DAEMON_NO_CLOSE_STDIO = 0
-
-
-GSOAP_VERSION     = 2.8.92
-GSOAP_INSTALL_DIR = ./gsoap-2.8
-GSOAP_DIR         = $(GSOAP_INSTALL_DIR)/gsoap
-GSOAP_CUSTOM_DIR  = $(GSOAP_DIR)/custom
-GSOAP_PLUGIN_DIR  = $(GSOAP_DIR)/plugin
-GSOAP_IMPORT_DIR  = $(GSOAP_DIR)/import
-OPENSSL_DIR       = ./openssl
-
-
-SOAPCPP2          = $(GSOAP_DIR)/src/soapcpp2
-WSDL2H            = $(GSOAP_DIR)/wsdl/wsdl2h
-GSOAP_CONFIGURE   = --disable-c-locale
-
-
-COMMON_DIR        = ./src
-GENERATED_DIR     = ./generated
-
-
-CXXFLAGS          = -DDAEMON_NAME='"$(DAEMON_NAME)"'
-CXXFLAGS         += -DDAEMON_MAJOR_VERSION=$(DAEMON_MAJOR_VERSION)
-CXXFLAGS         += -DDAEMON_MINOR_VERSION=$(DAEMON_MINOR_VERSION)
-CXXFLAGS         += -DDAEMON_PATCH_VERSION=$(DAEMON_PATCH_VERSION)
-CXXFLAGS         += -DDAEMON_PID_FILE_NAME='"$(DAEMON_PID_FILE_NAME)"'
-CXXFLAGS         += -DDAEMON_LOG_FILE_NAME='"$(DAEMON_LOG_FILE_NAME)"'
-CXXFLAGS         += -DDAEMON_NO_CHDIR=$(DAEMON_NO_CHDIR)
-CXXFLAGS         += -DDAEMON_NO_CLOSE_STDIO=$(DAEMON_NO_CLOSE_STDIO)
-
-CXXFLAGS         += -I$(COMMON_DIR)
-CXXFLAGS         += -I$(GENERATED_DIR)
-CXXFLAGS         += -I$(GSOAP_DIR) -I$(GSOAP_CUSTOM_DIR) -I$(GSOAP_PLUGIN_DIR) -I$(GSOAP_IMPORT_DIR)
-CXXFLAGS         += -std=c++11 -O2  -Wall  -pipe
-CXXFLAGS         += -DWITH_NO_C_LOCALE
-
-CXX              ?= g++
-
-
-
-
-
-# To build a daemon with WS-Security support,
-# call make with the WSSE_ON=1 parameter
-# example:
-# make WSSE_ON=1 all
-ifdef WSSE_ON
-CXXFLAGS        += -DWITH_OPENSSL -I$(OPENSSL_DIR)/include
-LDFLAGS         += openssl/libssl.a openssl/libcrypto.a -ldl
-
-WSSE_SOURCES     = $(GSOAP_PLUGIN_DIR)/wsseapi.c \
-                   $(GSOAP_PLUGIN_DIR)/mecevp.c  \
-                   $(GSOAP_PLUGIN_DIR)/smdevp.c  \
-                   $(GSOAP_PLUGIN_DIR)/wsaapi.c
-
-WSSE_IMPORT      = echo '\#import "wsse.h" ' >> $@
-else
-GSOAP_CONFIGURE += --disable-ssl
-endif
-
-
-
-
-
-
-
-SOAP_SRC = $(GSOAP_DIR)/stdsoap2.cpp        \
-           $(GSOAP_DIR)/dom.cpp             \
-           $(GSOAP_CUSTOM_DIR)/duration.c
-
-
-
-# We can't use wildcard func, this files will be generated
-SOAP_SERVICE_SRC = $(GENERATED_DIR)/soapDeviceBindingService.cpp \
-                   $(GENERATED_DIR)/soapMediaBindingService.cpp  \
-                   $(GENERATED_DIR)/soapPTZBindingService.cpp
-
-
-
-# Add your source files to the list.
-# Supported *.c  *.cpp  *.S files.
-# For other file types write a template rule for build, see below.
-SOURCES  = $(COMMON_DIR)/daemon.c                 \
-           $(COMMON_DIR)/$(DAEMON_NAME).cpp       \
-           $(COMMON_DIR)/eth_dev_param.cpp        \
-           $(COMMON_DIR)/ServiceContext.cpp       \
-           $(COMMON_DIR)/ServiceDevice.cpp        \
-           $(COMMON_DIR)/ServiceMedia.cpp         \
-           $(COMMON_DIR)/ServicePTZ.cpp           \
-           $(GENERATED_DIR)/soapC.cpp             \
-           $(SOAP_SRC)                            \
-           $(SOAP_SERVICE_SRC)                    \
-           $(WSSE_SOURCES)
-
-
-
-
-
-
-OBJECTS  := $(patsubst %.c,  %.o, $(SOURCES) )
-OBJECTS  := $(patsubst %.cpp,%.o, $(OBJECTS) )
-OBJECTS  := $(patsubst %.S,  %.o, $(OBJECTS) )
-
-
-DEBUG_SUFFIX   = debug
-
-DEBUG_OBJECTS := $(patsubst %.o, %_$(DEBUG_SUFFIX).o, $(OBJECTS) )
-
-
-
-
-WSDL_FILES = $(wildcard wsdl/*.wsdl wsdl/*.xsd)
-
-
-
-
-.PHONY: all
-all: debug release
-
-
-
-.PHONY: release
-release: CXXFLAGS := -s  $(CXXFLAGS)
-release: $(DAEMON_NAME)
-
-
-
-.PHONY: debug
-debug: DAEMON_NO_CLOSE_STDIO = 1
-debug: CXXFLAGS := -DDEBUG  -g  $(CXXFLAGS)
-debug: $(DAEMON_NAME)_$(DEBUG_SUFFIX)
-
-
-
-# release
-$(DAEMON_NAME): .depend $(OBJECTS)
-	$(call build_bin, $(OBJECTS))
-
-
-# debug
-$(DAEMON_NAME)_$(DEBUG_SUFFIX): .depend $(DEBUG_OBJECTS)
-	$(call build_bin, $(DEBUG_OBJECTS))
-
-
-
-# Build release objects
-%.o: %.c
-	$(build_object)
-
-
-%.o: %.cpp
-	$(build_object)
-
-
-%.o: %.S
-	$(build_object)
-
-
-
-# Build debug objects
-%_$(DEBUG_SUFFIX).o: %.c
-	$(build_object)
-
-
-%_$(DEBUG_SUFFIX).o: %.cpp
-	$(build_object)
-
-
-%_$(DEBUG_SUFFIX).o: %.S
-	$(build_object)
-
-
-
-.PHONY: clean
-clean:
-	-@rm -f $(DAEMON_NAME)
-	-@rm -f $(DAEMON_NAME)_$(DEBUG_SUFFIX)
-	-@rm -f $(OBJECTS)
-	-@rm -f $(DEBUG_OBJECTS)
-	-@rm -f .depend
-	-@rm -f -d -R $(GENERATED_DIR)
-	-@rm -f *.*~
-
-
-
-.PHONY: distclean
-distclean: clean
-	-@rm -f -d -R SDK
-	-@rm -f -d -R $(GSOAP_INSTALL_DIR)
-	-@rm -f RECV.log SENT.log TEST.log
-
-
-
-
-.depend: $(GENERATED_DIR)/soapC.cpp
-	-@rm -f .depend
-	@echo "Generating dependencies..."
-	@for src in $(SOURCES) ; do \
-        echo "  [depend]  $$src" ; \
-        $(CXX) $(CXXFLAGS) -MT ".depend $${src%.*}.o $${src%.*}_$(DEBUG_SUFFIX).o" -MM $$src >> .depend ; \
-    done
-
-
-
-ifeq "$(findstring $(MAKECMDGOALS),clean distclean)"  ""
-    include $(wildcard .depend)
-endif
-
-
-
-
-
-# ---- gSOAP ----
-
-$(GENERATED_DIR)/onvif.h:
-	@$(build_openssl)
-	@$(build_gsoap)
-	@mkdir -p $(GENERATED_DIR)
-	$(WSDL2H) -d -t ./wsdl/typemap.dat  -o $@  $(WSDL_FILES)
-	$(WSSE_IMPORT)
-
-
-
-$(GENERATED_DIR)/soapC.cpp: $(GENERATED_DIR)/onvif.h
-	$(SOAPCPP2) -j -L -x -S -d $(GENERATED_DIR) -I$(GSOAP_DIR):$(GSOAP_IMPORT_DIR) $<
-
-
-
-# This targets is needed for parallel work of make
-$(OBJECTS) $(DEBUG_OBJECTS) $(SOAP_SRC) $(SOAP_SERVICE_SRC) $(WSSE_SOURCES): $(GENERATED_DIR)/soapC.cpp
-
-
-
-
-# Common commands
-BUILD_ECHO = echo "\n  [build]  $@:"
-
-
-define build_object
-    @$(BUILD_ECHO)
-    $(CXX) -c $< -o $@  $(CXXFLAGS)
-endef
-
-
-
-define build_bin
-    @$(BUILD_ECHO)
-    $(CXX)  $1 -o $@  $(CXXFLAGS) $(LDFLAGS)
-    @echo "\n---- Compiled $@ ver $(DAEMON_MAJOR_VERSION).$(DAEMON_MINOR_VERSION).$(DAEMON_PATCH_VERSION) ----\n"
-endef
-
-
-
-define build_gsoap
-
-    # get archive
-    if [ ! -f SDK/gsoap.zip ]; then \
-        mkdir -p SDK; \
-	wget -O ./SDK/gsoap.zip.tmp "http://dl.t2-project.org/mirror/trunk/g/gsoap_$(GSOAP_VERSION).zip" || \
-        wget -O ./SDK/gsoap.zip.tmp "https://sourceforge.net/projects/gsoap2/files/gsoap-2.8/gsoap_$(GSOAP_VERSION).zip/download"   || \
-        wget -O ./SDK/gsoap.zip.tmp "https://sourceforge.net/projects/gsoap2/files/oldreleases/gsoap_$(GSOAP_VERSION).zip/download" || \
-        wget -O ./SDK/gsoap.zip.tmp "https://master.dl.sourceforge.net/project/gsoap2/oldreleases/gsoap_$(GSOAP_VERSION).zip"       && \
-        mv ./SDK/gsoap.zip.tmp ./SDK/gsoap.zip; \
-    fi
-
-    # unzip
-    if [ ! -f $(GSOAP_INSTALL_DIR)/README.txt ]; then \
-         unzip ./SDK/gsoap.zip; \
-    fi
-
-    # build
-    if [ ! -f $(SOAPCPP2) ] || [ ! -f $(WSDL2H) ]; then \
-         cd $(GSOAP_INSTALL_DIR); \
-         unset CXX && ./configure $(GSOAP_CONFIGURE) && \
-         make -j1; \
-         cd ..;\
-    fi
-endef
-
-
-
-define build_openssl
-
-    # get archive
-    if [ ! -f SDK/openssl.tar.gz ]; then \
-        mkdir -p SDK; \
-        wget -O ./SDK/openssl.tar.gz.tmp "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz" && \
-        mv ./SDK/openssl.tar.gz.tmp ./SDK/openssl.tar.gz; \
-    fi
-
-    # untar
-    if [ ! -f openssl-1.0.2u/README ]; then \
-        tar zxvf ./SDK/openssl.tar.gz; \
-        ln -s openssl-1.0.2u openssl; \
-    fi
-
-    # build
-    if [ ! -f openssl/libcrypto.so.1.0.0 ] || [ ! -f openssl/libssl.so.1.0.0 ]; then \
-        cd openssl; \
-        CC=arm-hisiv300-linux-uclibcgnueabi-gcc ./Configure linux-generic32 && \
-        CC=arm-hisiv300-linux-uclibcgnueabi-gcc make; \
-        cd ..;\
-    fi
-endef
-
-
-
-.PHONY: help
-help:
-	@echo "make [command]"
-	@echo "command is:"
-	@echo "   all       -  build daemon in release and debug mode"
-	@echo "   debug     -  build in debug mode (#define DEBUG 1)"
-	@echo "   release   -  build in release mode (strip)"
-	@echo "   clean     -  remove all generated files"
-	@echo "   distclean -  clean + remove all SDK files"
-	@echo "   help      -  this help"
-
diff --git a/src/onvif_srvd/onvif_srvd/README.md b/src/onvif_srvd/onvif_srvd/README.md
deleted file mode 100644
index 5302f2f..0000000
--- a/src/onvif_srvd/onvif_srvd/README.md
+++ /dev/null
@@ -1,121 +0,0 @@
-# ONVIF Device(IP camera) Service server
-
-
-## Description
-
-**onvif_srvd** - ONVIF Device(IP camera) Service server (Linux daemon)
-
-This server (Service) has a minimal implementation. Use this server as a template for writing your ONVIF service for an IP camera.
-
-
-ONVIF official website: [https://www.onvif.org](https://www.onvif.org)
-and their [github presence](https://github.com/onvif/).
-
-The web services data binding is generated using [gSOAP](https://www.genivia.com)
-
-
-
-
-## Build
-
-#### Dependencies
-Most Linux systems for building this project require the following packages to be installed: `make m4 flex bison byacc yacc`
-
-If you need support for encryption and WS-Security then you also need: `openssl zlib libcrypto`
-
-
-For example, on ubuntu 20.04, you needed to install:
-```console
-sudo apt install flex bison byacc make m4
-
-#for support encryption and WS-Security
-sudo apt install openssl libssl-dev libcrypto++6
-```
-
-To start build you have to choose your compiler (or toolchain) in the [Makefile](./Makefile) (see variable `$CXX`).
-
-For build use make for [Makefile](./Makefile):
-```console
-make target
-```
-
-target is:
- - `all`       -  build daemon in release and debug mode
- - `debug`     -  build in debug mode (#define DEBUG 1)
- - `release`   -  build in release mode (strip)
- - `clean`     -  remove all generated files
- - `distclean` -  clean + remove all SDK files
- - `help`      -  show list support targets
-
-
-> **Note**: If you need WS-Security support, you need to call make with the `WSSE_ON=1` parameter.
-
-Show how enable support WS-Security:
-```console
-make WSSE_ON=1
-```
-
-If before make was done without WS-Security support, **must cleanup** (We need to rebuild the gsoap with `openssl` support):
-```console
-make distclean
-```
-
-
-
-## Usage
-
-To start the daemon, you have to give him the parameters that are needed for work:
-
-```console
-./onvif_srvd  --ifs eth0 --scope onvif://www.onvif.org/name/TestDev --scope onvif://www.onvif.org/Profile/S --name RTSP --width 800 --height 600 --url rtsp://%s:554/unicast --type JPEG"
-```
-The `--url` option can contain or static IP or dynamic (template parameter `%s`) that will be replaced with the IP address of the interface, see the option `--ifs`.
-
-For more details see help:
-```console
-./onvif_srvd --help
-```
-
-Or you can use [S90onvif_srvd](./start_scripts/S90onvif_srvd) script to start the daemon (for old init.d script style):
-```console
-./start_scripts/S90onvif_srvd start
-```
-
-If You use systemd see:
-[onvif_srvd.service](./start_scripts/onvif_srvd.service)
-
-
-
-## Testing
-
-For testing daemon you need client application.
-
-
-#### Linux:
-1. [ONVIF Device Tool (GUI)](http://lingodigit.com/onvif_nvc.html)
-
-> **Note**:
-> 1. ONVIF Device Tool at me this application falls when show the first frame of RTSP. Sad :(.
-> 2. This application requires support for **WS-Security**
-> 3. This application requires support for [**WS-Discovery**](https://github.com/KoynovStas/wsdd)
-
-
-
-2. [gsoap-onvif](https://github.com/tonyhu/gsoap-onvif)
-
-Only the console client, useful for debugging.
-
-Usage:
-```console
-./ipconvif 127.0.0.1:1000
-```
-
-
-#### Windows:
-1. [ONVIF Device Manager](https://sourceforge.net/projects/onvifdm/)
-
-
-
-## License
-
-[BSD-3-Clause](./LICENSE).
diff --git a/src/onvif_srvd/onvif_srvd/src/ServiceContext.cpp b/src/onvif_srvd/onvif_srvd/src/ServiceContext.cpp
deleted file mode 100644
index 76120ab..0000000
--- a/src/onvif_srvd/onvif_srvd/src/ServiceContext.cpp
+++ /dev/null
@@ -1,500 +0,0 @@
-#include <arpa/inet.h>
-
-#include <sstream>
-
-#include "ServiceContext.h"
-#include "stools.h"
-
-
-
-
-
-ServiceContext::ServiceContext():
-    port     ( 1000    ),
-    user     ( "admin" ),
-    password ( "admin" ),
-
-
-    //Device Information
-    manufacturer     ( "Manufacturer"   ),
-    model            ( "Model"          ),
-    firmware_version ( "FirmwareVersion"),
-    serial_number    ( "SerialNumber"   ),
-    hardware_id      ( "HardwareId"     )
-{
-}
-
-
-
-std::string ServiceContext::getServerIpFromClientIp(uint32_t client_ip) const
-{
-    char server_ip[INET_ADDRSTRLEN];
-
-
-    if (eth_ifs.size() == 1)
-    {
-        eth_ifs[0].get_ip(server_ip);
-        return server_ip;
-    }
-
-    for(size_t i = 0; i < eth_ifs.size(); ++i)
-    {
-        uint32_t if_ip, if_mask;
-        eth_ifs[i].get_ip(&if_ip);
-        eth_ifs[i].get_mask(&if_mask);
-
-        if( (if_ip & if_mask) == (client_ip & if_mask) )
-        {
-            eth_ifs[i].get_ip(server_ip);
-            return server_ip;
-        }
-    }
-
-
-    return "127.0.0.1";  //localhost
-}
-
-
-
-std::string ServiceContext::getXAddr(soap *soap) const
-{
-    std::ostringstream os;
-
-    os << "http://" << getServerIpFromClientIp(htonl(soap->ip)) << ":" << port;
-
-    return os.str();
-}
-
-
-
-bool ServiceContext::add_profile(const StreamProfile &profile)
-{
-    if( !profile.is_valid() )
-    {
-        str_err = "profile has unset parameters";
-        return false;
-    }
-
-
-    if( profiles.find(profile.get_name()) != profiles.end() )
-    {
-        str_err = "profile: " + profile.get_name() +  " already exist";
-        return false;
-    }
-
-
-    profiles[profile.get_name()] = profile;
-    return true;
-}
-
-
-
-std::string ServiceContext::get_stream_uri(const std::string &profile_url, uint32_t client_ip) const
-{
-    std::string uri(profile_url);
-    std::string template_str("%s");
-
-
-    auto it = uri.find(template_str, 0);
-
-    if( it != std::string::npos )
-        uri.replace(it, template_str.size(), getServerIpFromClientIp(client_ip));
-
-
-    return uri;
-}
-
-
-
-std::string ServiceContext::get_snapshot_uri(const std::string &profile_url, uint32_t client_ip) const
-{
-    std::string uri(profile_url);
-    std::string template_str("%s");
-
-
-    auto it = uri.find(template_str, 0);
-
-    if( it != std::string::npos )
-        uri.replace(it, template_str.size(), getServerIpFromClientIp(client_ip));
-
-
-    return uri;
-}
-
-
-
-tds__DeviceServiceCapabilities *ServiceContext::getDeviceServiceCapabilities(soap *soap)
-{
-    tds__DeviceServiceCapabilities *capabilities = soap_new_tds__DeviceServiceCapabilities(soap);
-
-    capabilities->Network = soap_new_tds__NetworkCapabilities(soap);
-
-    capabilities->Network->IPFilter            = soap_new_ptr(soap, false);
-    capabilities->Network->ZeroConfiguration   = soap_new_ptr(soap, false);
-    capabilities->Network->IPVersion6          = soap_new_ptr(soap, false);
-    capabilities->Network->DynDNS              = soap_new_ptr(soap, false);
-    capabilities->Network->Dot11Configuration  = soap_new_ptr(soap, false);
-    capabilities->Network->Dot1XConfigurations = soap_new_ptr(soap, 0);
-    capabilities->Network->HostnameFromDHCP    = soap_new_ptr(soap, false);
-    capabilities->Network->NTP                 = soap_new_ptr(soap, 0);
-    capabilities->Network->DHCPv6              = soap_new_ptr(soap, false);
-
-
-    capabilities->Security = soap_new_tds__SecurityCapabilities(soap);
-
-    capabilities->Security->TLS1_x002e0          = soap_new_ptr(soap, false);
-    capabilities->Security->TLS1_x002e1          = soap_new_ptr(soap, false);
-    capabilities->Security->TLS1_x002e2          = soap_new_ptr(soap, false);
-    capabilities->Security->OnboardKeyGeneration = soap_new_ptr(soap, false);
-    capabilities->Security->AccessPolicyConfig   = soap_new_ptr(soap, false);
-    capabilities->Security->DefaultAccessPolicy  = soap_new_ptr(soap, false);
-    capabilities->Security->Dot1X                = soap_new_ptr(soap, false);
-    capabilities->Security->RemoteUserHandling   = soap_new_ptr(soap, false);
-    capabilities->Security->X_x002e509Token      = soap_new_ptr(soap, false);
-    capabilities->Security->SAMLToken            = soap_new_ptr(soap, false);
-    capabilities->Security->KerberosToken        = soap_new_ptr(soap, false);
-    capabilities->Security->UsernameToken        = soap_new_ptr(soap, false);
-    capabilities->Security->HttpDigest           = soap_new_ptr(soap, false);
-    capabilities->Security->RELToken             = soap_new_ptr(soap, false);
-    capabilities->Security->MaxUsers             = soap_new_ptr(soap, 0);
-    capabilities->Security->MaxUserNameLength    = soap_new_ptr(soap, 0);
-    capabilities->Security->MaxPasswordLength    = soap_new_ptr(soap, 0);
-
-
-    capabilities->System = soap_new_tds__SystemCapabilities(soap);
-
-    capabilities->System->DiscoveryResolve       = soap_new_ptr(soap, true);
-    capabilities->System->DiscoveryBye           = soap_new_ptr(soap, true);
-    capabilities->System->RemoteDiscovery        = soap_new_ptr(soap, true);
-    capabilities->System->SystemBackup           = soap_new_ptr(soap, false);
-    capabilities->System->SystemLogging          = soap_new_ptr(soap, false);
-    capabilities->System->FirmwareUpgrade        = soap_new_ptr(soap, false);
-    capabilities->System->HttpFirmwareUpgrade    = soap_new_ptr(soap, false);
-    capabilities->System->HttpSystemBackup       = soap_new_ptr(soap, false);
-    capabilities->System->HttpSystemLogging      = soap_new_ptr(soap, false);
-    capabilities->System->HttpSupportInformation = soap_new_ptr(soap, false);
-    capabilities->System->StorageConfiguration   = soap_new_ptr(soap, false);
-
-
-    return capabilities;
-}
-
-
-
-trt__Capabilities *ServiceContext::getMediaServiceCapabilities(soap *soap)
-{
-    trt__Capabilities *capabilities = soap_new_trt__Capabilities(soap);
-
-    auto profiles = this->get_profiles();
-    for( auto it = profiles.cbegin(); it != profiles.cend(); ++it ) {
-        if (( !it->second.get_snapurl().empty() ) && ( capabilities->SnapshotUri == NULL )) {
-            capabilities->SnapshotUri = soap_new_ptr(soap, true);
-        }
-    }
-
-    capabilities->ProfileCapabilities = soap_new_trt__ProfileCapabilities(soap);
-    capabilities->ProfileCapabilities->MaximumNumberOfProfiles = soap_new_ptr(soap, 1);
-
-    capabilities->StreamingCapabilities = soap_new_trt__StreamingCapabilities(soap);
-    capabilities->StreamingCapabilities->RTPMulticast = soap_new_ptr(soap, false);
-    capabilities->StreamingCapabilities->RTP_USCORETCP = soap_new_ptr(soap, false);
-    capabilities->StreamingCapabilities->RTP_USCORERTSP_USCORETCP = soap_new_ptr(soap, true);
-
-
-    return capabilities;
-}
-
-
-
-tptz__Capabilities *ServiceContext::getPTZServiceCapabilities(soap *soap)
-{
-    tptz__Capabilities *capabilities = soap_new_tptz__Capabilities(soap);
-
-    return capabilities;
-}
-
-
-
-
-// ------------------------------- StreamProfile -------------------------------
-
-
-
-
-tt__VideoSourceConfiguration* StreamProfile::get_video_src_cnf(struct soap *soap) const
-{
-    tt__VideoSourceConfiguration* src_cfg = soap_new_tt__VideoSourceConfiguration(soap);
-
-    src_cfg->token       = name;
-    src_cfg->SourceToken = name;
-    src_cfg->Bounds      = soap_new_req_tt__IntRectangle(soap, 0, 0, width, height);
-
-    return src_cfg;
-}
-
-
-
-tt__VideoEncoderConfiguration* StreamProfile::get_video_enc_cfg(struct soap *soap) const
-{
-    tt__VideoEncoderConfiguration* enc_cfg = soap_new_tt__VideoEncoderConfiguration(soap);
-
-    enc_cfg->Name               = name;
-    enc_cfg->token              = name;
-    enc_cfg->Resolution         = soap_new_req_tt__VideoResolution(soap, width, height);
-    enc_cfg->RateControl        = soap_new_req_tt__VideoRateControl(soap, 0, 0, 0);
-    enc_cfg->Multicast          = soap_new_tt__MulticastConfiguration(soap);
-    enc_cfg->Multicast->Address = soap_new_tt__IPAddress(soap);
-    enc_cfg->Encoding           = static_cast<tt__VideoEncoding>(type);
-//    enc_cfg->GuaranteedFrameRate= soap_new_ptr(soap, true);
-    enc_cfg->H264               = soap_new_tt__H264Configuration(soap);
-    enc_cfg->H264->GovLength    = 40;
-    enc_cfg->H264->H264Profile  = tt__H264Profile__Main;
-
-    return enc_cfg;
-}
-
-
-
-tt__PTZConfiguration* StreamProfile::get_ptz_cfg(struct soap *soap) const
-{
-    tt__PTZConfiguration* ptz_cfg = soap_new_tt__PTZConfiguration(soap);
-
-    ptz_cfg->Name               = "PTZ";
-    ptz_cfg->token              = "PTZToken";
-    ptz_cfg->NodeToken          = "PTZNodeToken";
-
-    ptz_cfg->DefaultAbsolutePantTiltPositionSpace    = soap_new_std__string(soap);
-    *ptz_cfg->DefaultAbsolutePantTiltPositionSpace   = "http://www.onvif.org/ver10/tptz/PanTiltSpaces/PositionGenericSpace";
-    ptz_cfg->DefaultAbsoluteZoomPositionSpace        = soap_new_std__string(soap);
-    *ptz_cfg->DefaultAbsoluteZoomPositionSpace       = "http://www.onvif.org/ver10/tptz/ZoomSpaces/PositionGenericSpace";
-    ptz_cfg->DefaultRelativePanTiltTranslationSpace  = soap_new_std__string(soap);
-    *ptz_cfg->DefaultRelativePanTiltTranslationSpace = "http://www.onvif.org/ver10/tptz/PanTiltSpaces/TranslationGenericSpace";
-    ptz_cfg->DefaultRelativeZoomTranslationSpace     = soap_new_std__string(soap);
-    *ptz_cfg->DefaultRelativeZoomTranslationSpace    = "http://www.onvif.org/ver10/tptz/ZoomSpaces/TranslationGenericSpace";
-    ptz_cfg->DefaultContinuousPanTiltVelocitySpace   = soap_new_std__string(soap);
-    *ptz_cfg->DefaultContinuousPanTiltVelocitySpace  = "http://www.onvif.org/ver10/tptz/PanTiltSpaces/VelocityGenericSpace";
-    ptz_cfg->DefaultContinuousZoomVelocitySpace      = soap_new_std__string(soap);
-    *ptz_cfg->DefaultContinuousZoomVelocitySpace     = "http://www.onvif.org/ver10/tptz/ZoomSpaces/VelocityGenericSpace";
-
-    ptz_cfg->DefaultPTZSpeed                   = soap_new_tt__PTZSpeed(soap);
-    ptz_cfg->DefaultPTZSpeed->PanTilt          = soap_new_req_tt__Vector2D(soap, 0.1f, 0.1f);
-    ptz_cfg->DefaultPTZSpeed->Zoom             = soap_new_req_tt__Vector1D(soap, 1.0f);
-
-    ptz_cfg->DefaultPTZTimeout                 = soap_new_ptr(soap, (LONG64)1000);
-
-    ptz_cfg->PanTiltLimits                     = soap_new_tt__PanTiltLimits(soap);
-    ptz_cfg->PanTiltLimits->Range              = soap_new_tt__Space2DDescription(soap);
-    ptz_cfg->PanTiltLimits->Range->URI         = "http://www.onvif.org/ver10/tptz/PanTiltSpaces/PositionGenericSpace";
-    ptz_cfg->PanTiltLimits->Range->XRange      = soap_new_req_tt__FloatRange(soap, -INFINITY, INFINITY);
-    ptz_cfg->PanTiltLimits->Range->YRange      = soap_new_req_tt__FloatRange(soap, -INFINITY, INFINITY);
-
-    ptz_cfg->ZoomLimits                        = soap_new_tt__ZoomLimits(soap);
-    ptz_cfg->ZoomLimits->Range                 = soap_new_tt__Space1DDescription(soap);
-    ptz_cfg->ZoomLimits->Range->URI            = "http://www.onvif.org/ver10/tptz/ZoomSpaces/PositionGenericSpace";
-    ptz_cfg->ZoomLimits->Range->XRange         = soap_new_req_tt__FloatRange(soap, -INFINITY, INFINITY);
-
-    return ptz_cfg;
-}
-
-
-
-tt__Profile* StreamProfile::get_profile(struct soap *soap) const
-{
-    ServiceContext* ctx = (ServiceContext*)soap->user;
-
-    tt__Profile* profile = soap_new_tt__Profile(soap);
-
-    profile->Name  = name;
-    profile->token = name;
-    profile->fixed = soap_new_ptr(soap, true);
-
-    profile->VideoSourceConfiguration  = get_video_src_cnf(soap);
-    profile->VideoEncoderConfiguration = get_video_enc_cfg(soap);
-    if (ctx->get_ptz_node()->enable) {
-        profile->PTZConfiguration = get_ptz_cfg(soap);
-    }
-
-    return profile;
-}
-
-
-
-tt__VideoSource* StreamProfile::get_video_src(soap *soap) const
-{
-    tt__VideoSource* video_src = soap_new_tt__VideoSource(soap);
-
-    video_src->token      = name;
-    video_src->Resolution = soap_new_req_tt__VideoResolution(soap, width, height);
-    video_src->Imaging    = soap_new_tt__ImagingSettings(soap);
-
-    return video_src;
-}
-
-
-
-bool StreamProfile::set_name(const char *new_val)
-{
-    if(!new_val)
-    {
-        str_err = "Name is empty";
-        return false;
-    }
-
-
-    name = new_val;
-    return true;
-}
-
-
-
-bool StreamProfile::set_width(const char *new_val)
-{
-
-    std::istringstream ss(new_val);
-    int tmp_val;
-    ss >> tmp_val;
-
-
-    if( (tmp_val < 100) || (tmp_val >= 10000) )
-    {
-        str_err = "width is bad, correct range: 100-10000";
-        return false;
-    }
-
-
-    width = tmp_val;
-    return true;
-}
-
-
-
-bool StreamProfile::set_height(const char *new_val)
-{
-    std::istringstream ss(new_val);
-    int tmp_val;
-    ss >> tmp_val;
-
-
-    if( (tmp_val < 100) || (tmp_val >= 10000) )
-    {
-        str_err = "height is bad, correct range: 100-10000";
-        return false;
-    }
-
-
-    height = tmp_val;
-    return true;
-}
-
-
-
-bool StreamProfile::set_url(const char *new_val)
-{
-    if(!new_val)
-    {
-        str_err = "URL is empty";
-        return false;
-    }
-
-
-    url = new_val;
-    return true;
-}
-
-
-
-bool StreamProfile::set_snapurl(const char *new_val)
-{
-    if(!new_val)
-    {
-        str_err = "URL is empty";
-        return false;
-    }
-
-
-    snapurl = new_val;
-    return true;
-}
-
-
-
-bool StreamProfile::set_type(const char *new_val)
-{
-    std::string new_type(new_val);
-
-
-    if( new_type == "JPEG" )
-        type = tt__VideoEncoding__JPEG;
-    else if( new_type == "MPEG4" )
-        type = tt__VideoEncoding__MPEG4;
-    else if( new_type == "H264" )
-        type = tt__VideoEncoding__H264;
-    else
-    {
-        str_err = "type dont support";
-        return false;
-    }
-
-
-    return true;
-}
-
-
-
-void StreamProfile::clear()
-{
-    name.clear();
-    url.clear();
-    snapurl.clear();
-
-    width  = -1;
-    height = -1;
-    type   = -1;
-}
-
-
-
-bool StreamProfile::is_valid() const
-{
-    return ( !name.empty()  &&
-             !url.empty()   &&
-             (width  != -1) &&
-             (height != -1) &&
-             (type   != -1)
-           );
-}
-
-
-
-
-// ------------------------------- PTZNode -------------------------------
-
-
-
-
-void PTZNode::clear()
-{
-    enable = false;
-
-    move_left.clear();
-    move_right.clear();
-    move_up.clear();
-    move_down.clear();
-    move_stop.clear();
-    move_preset.clear();
-}
-
-
-
-bool PTZNode::set_str_value(const char* new_val, std::string& value)
-{
-    if(!new_val)
-    {
-        str_err = "Process is empty";
-        return false;
-    }
-
-
-    value = new_val;
-    return true;
-}
diff --git a/src/onvif_srvd/onvif_srvd/src/ServiceContext.h b/src/onvif_srvd/onvif_srvd/src/ServiceContext.h
deleted file mode 100644
index 64daa64..0000000
--- a/src/onvif_srvd/onvif_srvd/src/ServiceContext.h
+++ /dev/null
@@ -1,193 +0,0 @@
-#ifndef SERVICECONTEXT_H
-#define SERVICECONTEXT_H
-
-
-#include <string>
-#include <vector>
-#include <map>
-
-#include "soapH.h"
-#include "eth_dev_param.h"
-
-
-
-
-
-class StreamProfile
-{
-    public:
-
-        StreamProfile() { clear(); }
-
-        std::string  get_name   (void) const { return name;   }
-        int          get_width  (void) const { return width;  }
-        int          get_height (void) const { return height; }
-        std::string  get_url    (void) const { return url;    }
-        std::string  get_snapurl(void) const { return snapurl;}
-        int          get_type   (void) const { return type;   }
-
-
-
-        tt__Profile*     get_profile(struct soap *soap) const;
-        tt__VideoSource* get_video_src(struct soap *soap) const;
-
-        tt__VideoSourceConfiguration*  get_video_src_cnf(struct soap *soap) const;
-        tt__VideoEncoderConfiguration* get_video_enc_cfg(struct soap *soap) const;
-        tt__PTZConfiguration*          get_ptz_cfg(struct soap *soap) const;
-
-
-
-        //methods for parsing opt from cmd
-        bool set_name   (const char *new_val);
-        bool set_width  (const char *new_val);
-        bool set_height (const char *new_val);
-        bool set_url    (const char *new_val);
-        bool set_snapurl(const char *new_val);
-        bool set_type   (const char *new_val);
-
-
-        std::string get_str_err()  const { return str_err;         }
-        const char* get_cstr_err() const { return str_err.c_str(); }
-
-        void clear(void);
-        bool is_valid(void) const;
-
-
-    private:
-
-        std::string  name;
-        int          width;
-        int          height;
-        std::string  url;
-        std::string  snapurl;
-        int          type;
-
-
-        std::string  str_err;
-};
-
-
-
-
-
-class PTZNode
-{
-    public:
-
-        PTZNode() { clear(); }
-
-        bool         enable;
-
-        std::string  get_move_left   (void) const { return move_left;   }
-        std::string  get_move_right  (void) const { return move_right;  }
-        std::string  get_move_up     (void) const { return move_up;     }
-        std::string  get_move_down   (void) const { return move_down;   }
-        std::string  get_move_stop   (void) const { return move_stop;   }
-        std::string  get_move_preset (void) const { return move_preset;   }
-
-
-
-        //methods for parsing opt from cmd
-        bool set_move_left   (const char *new_val) { return set_str_value(new_val, move_left  ); }
-        bool set_move_right  (const char *new_val) { return set_str_value(new_val, move_right ); }
-        bool set_move_up     (const char *new_val) { return set_str_value(new_val, move_up    ); }
-        bool set_move_down   (const char *new_val) { return set_str_value(new_val, move_down  ); }
-        bool set_move_stop   (const char *new_val) { return set_str_value(new_val, move_stop  ); }
-        bool set_move_preset (const char *new_val) { return set_str_value(new_val, move_preset); }
-
-
-        std::string get_str_err()  const { return str_err;         }
-        const char* get_cstr_err() const { return str_err.c_str(); }
-
-        void clear(void);
-
-
-    private:
-
-        std::string  move_left;
-        std::string  move_right;
-        std::string  move_up;
-        std::string  move_down;
-        std::string  move_stop;
-        std::string  move_preset;
-
-
-        std::string  str_err;
-
-        bool set_str_value(const char *new_val, std::string& value);
-};
-
-
-
-
-
-class ServiceContext
-{
-    public:
-
-        ServiceContext();
-
-
-        int         port;
-        std::string user;
-        std::string password;
-
-
-        //Device Information
-        std::string manufacturer;
-        std::string model;
-        std::string firmware_version;
-        std::string serial_number;
-        std::string hardware_id;
-
-        std::vector<std::string> scopes;
-
-
-        std::vector<Eth_Dev_Param> eth_ifs; //ethernet interfaces
-
-
-        std::string getServerIpFromClientIp(uint32_t client_ip) const;
-        std::string getXAddr(struct soap* soap) const;
-
-
-
-        std::string get_str_err() const { return str_err;         }
-        const char* get_cstr_err()const { return str_err.c_str(); }
-
-
-        bool add_profile(const StreamProfile& profile);
-
-
-        std::string get_stream_uri(const std::string& profile_url, uint32_t client_ip) const;
-        std::string get_snapshot_uri(const std::string& profile_url, uint32_t client_ip) const;
-
-
-        const std::map<std::string, StreamProfile> &get_profiles(void) { return profiles; }
-        PTZNode* get_ptz_node(void) { return &ptz_node; }
-
-        // service capabilities
-        tds__DeviceServiceCapabilities* getDeviceServiceCapabilities(struct soap* soap);
-        trt__Capabilities*  getMediaServiceCapabilities    (struct soap* soap);
-        tptz__Capabilities*  getPTZServiceCapabilities     (struct soap* soap);
-//        timg__Capabilities* getImagingServiceCapabilities  (struct soap* soap);
-//        trc__Capabilities*  getRecordingServiceCapabilities(struct soap* soap);
-//        tse__Capabilities*  getSearchServiceCapabilities   (struct soap* soap);
-//        trv__Capabilities*  getReceiverServiceCapabilities (struct soap* soap);
-//        trp__Capabilities*  getReplayServiceCapabilities   (struct soap* soap);
-//        tev__Capabilities*  getEventServiceCapabilities    (struct soap* soap);
-//        tls__Capabilities*  getDisplayServiceCapabilities  (struct soap* soap);
-//        tmd__Capabilities*  getDeviceIOServiceCapabilities (struct soap* soap);
-
-    private:
-
-        std::map<std::string, StreamProfile> profiles;
-        PTZNode ptz_node;
-
-        std::string  str_err;
-};
-
-
-
-
-
-#endif // SERVICECONTEXT_H
diff --git a/src/onvif_srvd/onvif_srvd/src/ServiceDevice.cpp b/src/onvif_srvd/onvif_srvd/src/ServiceDevice.cpp
deleted file mode 100644
index c9b757f..0000000
--- a/src/onvif_srvd/onvif_srvd/src/ServiceDevice.cpp
+++ /dev/null
@@ -1,841 +0,0 @@
-/*
- --------------------------------------------------------------------------
- ServiceDevice.cpp
-
- Implementation of functions (methods) for the service:
- ONVIF devicemgmt.wsdl server side
------------------------------------------------------------------------------
-*/
-
-
-#include "soapDeviceBindingService.h"
-#include "ServiceContext.h"
-#include "smacros.h"
-#include "stools.h"
-
-
-
-
-
-int DeviceBindingService::GetServices(_tds__GetServices *tds__GetServices, _tds__GetServicesResponse &tds__GetServicesResponse)
-{
-    DEBUG_MSG("Device: %s\n", __FUNCTION__);
-
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    std::string XAddr = ctx->getXAddr(this->soap);
-
-
-
-    //Device Service
-    tds__GetServicesResponse.Service.push_back(soap_new_tds__Service(this->soap));
-    tds__GetServicesResponse.Service.back()->Namespace  = "http://www.onvif.org/ver10/device/wsdl";
-    tds__GetServicesResponse.Service.back()->XAddr      = XAddr;
-    tds__GetServicesResponse.Service.back()->Version    = soap_new_req_tt__OnvifVersion(this->soap, 2, 5);
-    if( tds__GetServices->IncludeCapability )
-    {
-        tds__GetServicesResponse.Service.back()->Capabilities        = soap_new__tds__Service_Capabilities(this->soap);
-        tds__DeviceServiceCapabilities *capabilities                 = ctx->getDeviceServiceCapabilities(this->soap);
-        tds__GetServicesResponse.Service.back()->Capabilities->__any = soap_dom_element(this->soap, NULL, "tds:Capabilities", capabilities, capabilities->soap_type());
-    }
-
-
-    tds__GetServicesResponse.Service.push_back(soap_new_tds__Service(this->soap));
-    tds__GetServicesResponse.Service.back()->Namespace  = "http://www.onvif.org/ver10/media/wsdl";
-    tds__GetServicesResponse.Service.back()->XAddr      = XAddr;
-    tds__GetServicesResponse.Service.back()->Version    = soap_new_req_tt__OnvifVersion(this->soap, 2, 6);
-    if (tds__GetServices->IncludeCapability)
-    {
-        tds__GetServicesResponse.Service.back()->Capabilities        = soap_new__tds__Service_Capabilities(this->soap);
-        trt__Capabilities *capabilities                              = ctx->getMediaServiceCapabilities(this->soap);
-        tds__GetServicesResponse.Service.back()->Capabilities->__any = soap_dom_element(this->soap, NULL, "trt:Capabilities", capabilities, capabilities->soap_type());
-    }
-
-
-    if (ctx->get_ptz_node()->enable) {
-        tds__GetServicesResponse.Service.push_back(soap_new_tds__Service(this->soap));
-        tds__GetServicesResponse.Service.back()->Namespace  = "http://www.onvif.org/ver20/ptz/wsdl";
-        tds__GetServicesResponse.Service.back()->XAddr      = XAddr;
-        tds__GetServicesResponse.Service.back()->Version    = soap_new_req_tt__OnvifVersion(this->soap, 2, 4);
-        if (tds__GetServices->IncludeCapability)
-        {
-            tds__GetServicesResponse.Service.back()->Capabilities        = soap_new__tds__Service_Capabilities(this->soap);
-            tptz__Capabilities *capabilities                             = ctx->getPTZServiceCapabilities(this->soap);
-            tds__GetServicesResponse.Service.back()->Capabilities->__any = soap_dom_element(this->soap, NULL, "tptz:Capabilities", capabilities, capabilities->soap_type());
-        }
-    }
-
-
-    return SOAP_OK;
-}
-
-
-
-int DeviceBindingService::GetServiceCapabilities(_tds__GetServiceCapabilities *tds__GetServiceCapabilities, _tds__GetServiceCapabilitiesResponse &tds__GetServiceCapabilitiesResponse)
-{
-    UNUSED(tds__GetServiceCapabilities);
-    DEBUG_MSG("Device: %s\n", __FUNCTION__);
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-    tds__GetServiceCapabilitiesResponse.Capabilities = ctx->getDeviceServiceCapabilities(this->soap);
-
-    return SOAP_OK;
-}
-
-
-
-int DeviceBindingService::GetDeviceInformation(_tds__GetDeviceInformation *tds__GetDeviceInformation, _tds__GetDeviceInformationResponse &tds__GetDeviceInformationResponse)
-{
-    UNUSED(tds__GetDeviceInformation);
-    DEBUG_MSG("Device: %s\n", __FUNCTION__);
-
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-    tds__GetDeviceInformationResponse.Manufacturer    = ctx->manufacturer;
-    tds__GetDeviceInformationResponse.Model           = ctx->model;
-    tds__GetDeviceInformationResponse.FirmwareVersion = ctx->firmware_version;
-    tds__GetDeviceInformationResponse.SerialNumber    = ctx->serial_number;
-    tds__GetDeviceInformationResponse.HardwareId      = ctx->hardware_id;
-
-    return SOAP_OK;
-}
-
-
-
-int DeviceBindingService::SetSystemDateAndTime(_tds__SetSystemDateAndTime *tds__SetSystemDateAndTime, _tds__SetSystemDateAndTimeResponse &tds__SetSystemDateAndTimeResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetSystemDateAndTime, "Device");
-}
-
-
-
-int DeviceBindingService::GetSystemDateAndTime(_tds__GetSystemDateAndTime *tds__GetSystemDateAndTime, _tds__GetSystemDateAndTimeResponse &tds__GetSystemDateAndTimeResponse)
-{
-    UNUSED(tds__GetSystemDateAndTime);
-    DEBUG_MSG("Device: %s\n", __FUNCTION__);
-
-
-    const time_t  timestamp = time(NULL);
-    struct tm    *tm        = gmtime(&timestamp);
-
-    tds__GetSystemDateAndTimeResponse.SystemDateAndTime                    = soap_new_tt__SystemDateTime(this->soap);
-    tds__GetSystemDateAndTimeResponse.SystemDateAndTime->DateTimeType      = tt__SetDateTimeType__Manual;
-    tds__GetSystemDateAndTimeResponse.SystemDateAndTime->DaylightSavings   = tm->tm_isdst;
-    tds__GetSystemDateAndTimeResponse.SystemDateAndTime->TimeZone          = soap_new_tt__TimeZone(this->soap);
-    tds__GetSystemDateAndTimeResponse.SystemDateAndTime->TimeZone->TZ      = "GMT0";
-    tds__GetSystemDateAndTimeResponse.SystemDateAndTime->UTCDateTime       = soap_new_tt__DateTime(this->soap);
-    tds__GetSystemDateAndTimeResponse.SystemDateAndTime->UTCDateTime->Time = soap_new_req_tt__Time(this->soap, tm->tm_hour, tm->tm_min  , tm->tm_sec );
-    tds__GetSystemDateAndTimeResponse.SystemDateAndTime->UTCDateTime->Date = soap_new_req_tt__Date(this->soap, tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday);
-
-    return SOAP_OK;
-}
-
-
-
-int DeviceBindingService::SetSystemFactoryDefault(_tds__SetSystemFactoryDefault *tds__SetSystemFactoryDefault, _tds__SetSystemFactoryDefaultResponse &tds__SetSystemFactoryDefaultResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetSystemFactoryDefault, "Device");
-}
-
-
-
-int DeviceBindingService::UpgradeSystemFirmware(_tds__UpgradeSystemFirmware *tds__UpgradeSystemFirmware, _tds__UpgradeSystemFirmwareResponse &tds__UpgradeSystemFirmwareResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__UpgradeSystemFirmware, "Device");
-}
-
-
-
-int DeviceBindingService::SystemReboot(_tds__SystemReboot *tds__SystemReboot, _tds__SystemRebootResponse &tds__SystemRebootResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SystemReboot, "Device");
-}
-
-
-
-int DeviceBindingService::RestoreSystem(_tds__RestoreSystem *tds__RestoreSystem, _tds__RestoreSystemResponse &tds__RestoreSystemResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__RestoreSystem, "Device");
-}
-
-
-
-int DeviceBindingService::GetSystemBackup(_tds__GetSystemBackup *tds__GetSystemBackup, _tds__GetSystemBackupResponse &tds__GetSystemBackupResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetSystemBackup, "Device");
-}
-
-
-
-int DeviceBindingService::GetSystemLog(_tds__GetSystemLog *tds__GetSystemLog, _tds__GetSystemLogResponse &tds__GetSystemLogResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetSystemLog, "Device");
-}
-
-
-
-int DeviceBindingService::GetSystemSupportInformation(_tds__GetSystemSupportInformation *tds__GetSystemSupportInformation, _tds__GetSystemSupportInformationResponse &tds__GetSystemSupportInformationResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetSystemSupportInformation, "Device");
-}
-
-
-
-int DeviceBindingService::GetScopes(_tds__GetScopes *tds__GetScopes, _tds__GetScopesResponse &tds__GetScopesResponse)
-{
-    UNUSED(tds__GetScopes);
-    DEBUG_MSG("Device: %s\n", __FUNCTION__);
-
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    for(size_t i = 0; i < ctx->scopes.size(); ++i)
-    {
-        tds__GetScopesResponse.Scopes.push_back(soap_new_req_tt__Scope(soap, tt__ScopeDefinition__Fixed, ctx->scopes[i]));
-    }
-
-    return SOAP_OK;
-}
-
-
-
-int DeviceBindingService::SetScopes(_tds__SetScopes *tds__SetScopes, _tds__SetScopesResponse &tds__SetScopesResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetScopes, "Device");
-}
-
-
-
-int DeviceBindingService::AddScopes(_tds__AddScopes *tds__AddScopes, _tds__AddScopesResponse &tds__AddScopesResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__AddScopes, "Device");
-}
-
-
-
-int DeviceBindingService::RemoveScopes(_tds__RemoveScopes *tds__RemoveScopes, _tds__RemoveScopesResponse &tds__RemoveScopesResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__RemoveScopes, "Device");
-}
-
-
-
-int DeviceBindingService::GetDiscoveryMode(_tds__GetDiscoveryMode *tds__GetDiscoveryMode, _tds__GetDiscoveryModeResponse &tds__GetDiscoveryModeResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetDiscoveryMode, "Device");
-}
-
-
-
-int DeviceBindingService::SetDiscoveryMode(_tds__SetDiscoveryMode *tds__SetDiscoveryMode, _tds__SetDiscoveryModeResponse &tds__SetDiscoveryModeResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetDiscoveryMode, "Device");
-}
-
-
-
-int DeviceBindingService::GetRemoteDiscoveryMode(_tds__GetRemoteDiscoveryMode *tds__GetRemoteDiscoveryMode, _tds__GetRemoteDiscoveryModeResponse &tds__GetRemoteDiscoveryModeResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetRemoteDiscoveryMode, "Device");
-}
-
-
-
-int DeviceBindingService::SetRemoteDiscoveryMode(_tds__SetRemoteDiscoveryMode *tds__SetRemoteDiscoveryMode, _tds__SetRemoteDiscoveryModeResponse &tds__SetRemoteDiscoveryModeResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetRemoteDiscoveryMode, "Device");
-}
-
-
-
-int DeviceBindingService::GetDPAddresses(_tds__GetDPAddresses *tds__GetDPAddresses, _tds__GetDPAddressesResponse &tds__GetDPAddressesResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetDPAddresses, "Device");
-}
-
-
-
-int DeviceBindingService::GetEndpointReference(_tds__GetEndpointReference *tds__GetEndpointReference, _tds__GetEndpointReferenceResponse &tds__GetEndpointReferenceResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetEndpointReference, "Device");
-}
-
-
-
-int DeviceBindingService::GetRemoteUser(_tds__GetRemoteUser *tds__GetRemoteUser, _tds__GetRemoteUserResponse &tds__GetRemoteUserResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetRemoteUser, "Device");
-}
-
-
-
-int DeviceBindingService::SetRemoteUser(_tds__SetRemoteUser *tds__SetRemoteUser, _tds__SetRemoteUserResponse &tds__SetRemoteUserResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetRemoteUser, "Device");
-}
-
-
-
-int DeviceBindingService::GetUsers(_tds__GetUsers *tds__GetUsers, _tds__GetUsersResponse &tds__GetUsersResponse)
-{
-    UNUSED(tds__GetUsers);
-    DEBUG_MSG("Device: %s\n", __FUNCTION__);
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    if( !ctx->user.empty() )
-    {
-        tds__GetUsersResponse.User.push_back(soap_new_tt__User(this->soap));
-        tds__GetUsersResponse.User.back()->Username = ctx->user;
-    }
-
-    return SOAP_OK;
-}
-
-
-
-int DeviceBindingService::CreateUsers(_tds__CreateUsers *tds__CreateUsers, _tds__CreateUsersResponse &tds__CreateUsersResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__CreateUsers, "Device");
-}
-
-
-
-int DeviceBindingService::DeleteUsers(_tds__DeleteUsers *tds__DeleteUsers, _tds__DeleteUsersResponse &tds__DeleteUsersResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__DeleteUsers, "Device");
-}
-
-
-
-int DeviceBindingService::SetUser(_tds__SetUser *tds__SetUser, _tds__SetUserResponse &tds__SetUserResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetUser, "Device");
-}
-
-
-
-int DeviceBindingService::GetWsdlUrl(_tds__GetWsdlUrl *tds__GetWsdlUrl, _tds__GetWsdlUrlResponse &tds__GetWsdlUrlResponse)
-{
-    UNUSED(tds__GetWsdlUrl);
-    DEBUG_MSG("Device: %s\n", __FUNCTION__);
-
-    std::string url = soap->endpoint;
-    tds__GetWsdlUrlResponse.WsdlUrl = url.c_str();
-
-    return SOAP_OK;
-}
-
-
-
-int DeviceBindingService::GetCapabilities(_tds__GetCapabilities *tds__GetCapabilities, _tds__GetCapabilitiesResponse &tds__GetCapabilitiesResponse)
-{
-    DEBUG_MSG("Device: %s\n", __FUNCTION__);
-
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    std::string XAddr = ctx->getXAddr(this->soap);
-
-
-
-    tds__GetCapabilitiesResponse.Capabilities = soap_new_tt__Capabilities(this->soap);
-    std::vector<tt__CapabilityCategory>& categories(tds__GetCapabilities->Category);
-    if(categories.empty())
-    {
-        categories.push_back(tt__CapabilityCategory__All);
-    }
-
-
-    for(tt__CapabilityCategory category : categories)
-    {
-        if(!tds__GetCapabilitiesResponse.Capabilities->Device && ( (category == tt__CapabilityCategory__All) || (category == tt__CapabilityCategory__Device) ) )
-        {
-            tds__GetCapabilitiesResponse.Capabilities->Device = soap_new_tt__DeviceCapabilities(this->soap);
-            tds__GetCapabilitiesResponse.Capabilities->Device->XAddr = XAddr;
-            tds__GetCapabilitiesResponse.Capabilities->Device->System = soap_new_tt__SystemCapabilities(this->soap);
-            tds__GetCapabilitiesResponse.Capabilities->Device->System->SupportedVersions.push_back(soap_new_req_tt__OnvifVersion(this->soap, 2, 0));
-            tds__GetCapabilitiesResponse.Capabilities->Device->Network = soap_new_tt__NetworkCapabilities(this->soap);
-            tds__GetCapabilitiesResponse.Capabilities->Device->Security = soap_new_tt__SecurityCapabilities(this->soap);
-            tds__GetCapabilitiesResponse.Capabilities->Device->IO = soap_new_tt__IOCapabilities(this->soap);
-        }
-
-
-        if(!tds__GetCapabilitiesResponse.Capabilities->Media && ( (category == tt__CapabilityCategory__All) || (category == tt__CapabilityCategory__Media) ) )
-        {
-            tds__GetCapabilitiesResponse.Capabilities->Media  = soap_new_tt__MediaCapabilities(this->soap);
-            tds__GetCapabilitiesResponse.Capabilities->Media->XAddr = XAddr;
-            tds__GetCapabilitiesResponse.Capabilities->Media->StreamingCapabilities = soap_new_tt__RealTimeStreamingCapabilities(this->soap);
-            tds__GetCapabilitiesResponse.Capabilities->Media->StreamingCapabilities->RTPMulticast = soap_new_ptr(soap, false);
-            tds__GetCapabilitiesResponse.Capabilities->Media->StreamingCapabilities->RTP_USCORETCP = soap_new_ptr(soap, false);
-            tds__GetCapabilitiesResponse.Capabilities->Media->StreamingCapabilities->RTP_USCORERTSP_USCORETCP = soap_new_ptr(soap, true);
-        }
-
-        if (ctx->get_ptz_node()->enable) {
-            if(!tds__GetCapabilitiesResponse.Capabilities->PTZ && ( (category == tt__CapabilityCategory__All) || (category == tt__CapabilityCategory__PTZ) ) )
-            {
-                tds__GetCapabilitiesResponse.Capabilities->PTZ  = soap_new_tt__PTZCapabilities(this->soap);
-                tds__GetCapabilitiesResponse.Capabilities->PTZ->XAddr = XAddr;
-            }
-        }
-
-    }
-
-
-    return SOAP_OK;
-}
-
-
-
-int DeviceBindingService::SetDPAddresses(_tds__SetDPAddresses *tds__SetDPAddresses, _tds__SetDPAddressesResponse &tds__SetDPAddressesResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetDPAddresses, "Device");
-}
-
-
-
-int DeviceBindingService::GetHostname(_tds__GetHostname *tds__GetHostname, _tds__GetHostnameResponse &tds__GetHostnameResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetHostname, "Device");
-}
-
-
-
-int DeviceBindingService::SetHostname(_tds__SetHostname *tds__SetHostname, _tds__SetHostnameResponse &tds__SetHostnameResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetHostname, "Device");
-}
-
-
-
-int DeviceBindingService::SetHostnameFromDHCP(_tds__SetHostnameFromDHCP *tds__SetHostnameFromDHCP, _tds__SetHostnameFromDHCPResponse &tds__SetHostnameFromDHCPResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetHostnameFromDHCP, "Device");
-}
-
-
-
-int DeviceBindingService::GetDNS(_tds__GetDNS *tds__GetDNS, _tds__GetDNSResponse &tds__GetDNSResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetDNS, "Device");
-}
-
-
-
-int DeviceBindingService::SetDNS(_tds__SetDNS *tds__SetDNS, _tds__SetDNSResponse &tds__SetDNSResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetDNS, "Device");
-}
-
-
-
-int DeviceBindingService::GetNTP(_tds__GetNTP *tds__GetNTP, _tds__GetNTPResponse &tds__GetNTPResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetNTP, "Device");
-}
-
-
-
-int DeviceBindingService::SetNTP(_tds__SetNTP *tds__SetNTP, _tds__SetNTPResponse &tds__SetNTPResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetNTP, "Device");
-}
-
-
-
-int DeviceBindingService::GetDynamicDNS(_tds__GetDynamicDNS *tds__GetDynamicDNS, _tds__GetDynamicDNSResponse &tds__GetDynamicDNSResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetDynamicDNS, "Device");
-}
-
-
-
-int DeviceBindingService::SetDynamicDNS(_tds__SetDynamicDNS *tds__SetDynamicDNS, _tds__SetDynamicDNSResponse &tds__SetDynamicDNSResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetDynamicDNS, "Device");
-}
-
-
-
-int DeviceBindingService::GetNetworkInterfaces(_tds__GetNetworkInterfaces *tds__GetNetworkInterfaces, _tds__GetNetworkInterfacesResponse &tds__GetNetworkInterfacesResponse)
-{
-    UNUSED(tds__GetNetworkInterfaces);
-    DEBUG_MSG("Device: %s\n", __FUNCTION__);
-
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-
-    for(size_t i = 0; i < ctx->eth_ifs.size(); ++i)
-    {
-
-        char tmp_buf[20];
-
-        tds__GetNetworkInterfacesResponse.NetworkInterfaces.push_back(soap_new_tt__NetworkInterface(this->soap));
-        tds__GetNetworkInterfacesResponse.NetworkInterfaces.back()->Enabled = true;
-        tds__GetNetworkInterfacesResponse.NetworkInterfaces.back()->Info = soap_new_tt__NetworkInterfaceInfo(this->soap);
-        tds__GetNetworkInterfacesResponse.NetworkInterfaces.back()->Info->Name = soap_new_std__string(this->soap);
-        tds__GetNetworkInterfacesResponse.NetworkInterfaces.back()->Info->Name->assign(ctx->eth_ifs[i].dev_name());
-
-        ctx->eth_ifs[i].get_hwaddr(tmp_buf);
-        tds__GetNetworkInterfacesResponse.NetworkInterfaces.back()->Info->HwAddress = tmp_buf;
-
-        tds__GetNetworkInterfacesResponse.NetworkInterfaces.back()->IPv4 = soap_new_tt__IPv4NetworkInterface(this->soap);
-        tds__GetNetworkInterfacesResponse.NetworkInterfaces.back()->IPv4->Config = soap_new_tt__IPv4Configuration(this->soap);
-        tds__GetNetworkInterfacesResponse.NetworkInterfaces.back()->IPv4->Config->Manual.push_back(soap_new_tt__PrefixedIPv4Address(this->soap));
-
-        ctx->eth_ifs[i].get_ip(tmp_buf);
-
-        tds__GetNetworkInterfacesResponse.NetworkInterfaces.back()->IPv4->Config->Manual.back()->Address = tmp_buf;
-        tds__GetNetworkInterfacesResponse.NetworkInterfaces.back()->IPv4->Config->Manual.back()->PrefixLength = ctx->eth_ifs[i].get_mask_prefix();
-
-    }
-
-
-    return SOAP_OK;
-}
-
-
-
-int DeviceBindingService::SetNetworkInterfaces(_tds__SetNetworkInterfaces *tds__SetNetworkInterfaces, _tds__SetNetworkInterfacesResponse &tds__SetNetworkInterfacesResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetNetworkInterfaces, "Device");
-}
-
-
-
-int DeviceBindingService::GetNetworkProtocols(_tds__GetNetworkProtocols *tds__GetNetworkProtocols, _tds__GetNetworkProtocolsResponse &tds__GetNetworkProtocolsResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetNetworkProtocols, "Device");
-}
-
-
-
-int DeviceBindingService::SetNetworkProtocols(_tds__SetNetworkProtocols *tds__SetNetworkProtocols, _tds__SetNetworkProtocolsResponse &tds__SetNetworkProtocolsResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetNetworkProtocols, "Device");
-}
-
-
-
-int DeviceBindingService::GetNetworkDefaultGateway(_tds__GetNetworkDefaultGateway *tds__GetNetworkDefaultGateway, _tds__GetNetworkDefaultGatewayResponse &tds__GetNetworkDefaultGatewayResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetNetworkDefaultGateway, "Device");
-}
-
-
-
-int DeviceBindingService::SetNetworkDefaultGateway(_tds__SetNetworkDefaultGateway *tds__SetNetworkDefaultGateway, _tds__SetNetworkDefaultGatewayResponse &tds__SetNetworkDefaultGatewayResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetNetworkDefaultGateway, "Device");
-}
-
-
-
-int DeviceBindingService::GetZeroConfiguration(_tds__GetZeroConfiguration *tds__GetZeroConfiguration, _tds__GetZeroConfigurationResponse &tds__GetZeroConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetZeroConfiguration, "Device");
-}
-
-
-
-int DeviceBindingService::SetZeroConfiguration(_tds__SetZeroConfiguration *tds__SetZeroConfiguration, _tds__SetZeroConfigurationResponse &tds__SetZeroConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetZeroConfiguration, "Device");
-}
-
-
-
-int DeviceBindingService::GetIPAddressFilter(_tds__GetIPAddressFilter *tds__GetIPAddressFilter, _tds__GetIPAddressFilterResponse &tds__GetIPAddressFilterResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetIPAddressFilter, "Device");
-}
-
-
-
-int DeviceBindingService::SetIPAddressFilter(_tds__SetIPAddressFilter *tds__SetIPAddressFilter, _tds__SetIPAddressFilterResponse &tds__SetIPAddressFilterResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetIPAddressFilter, "Device");
-}
-
-
-
-int DeviceBindingService::AddIPAddressFilter(_tds__AddIPAddressFilter *tds__AddIPAddressFilter, _tds__AddIPAddressFilterResponse &tds__AddIPAddressFilterResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__AddIPAddressFilter, "Device");
-}
-
-
-
-int DeviceBindingService::RemoveIPAddressFilter(_tds__RemoveIPAddressFilter *tds__RemoveIPAddressFilter, _tds__RemoveIPAddressFilterResponse &tds__RemoveIPAddressFilterResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__RemoveIPAddressFilter, "Device");
-}
-
-
-
-int DeviceBindingService::GetAccessPolicy(_tds__GetAccessPolicy *tds__GetAccessPolicy, _tds__GetAccessPolicyResponse &tds__GetAccessPolicyResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetAccessPolicy, "Device");
-}
-
-
-
-int DeviceBindingService::SetAccessPolicy(_tds__SetAccessPolicy *tds__SetAccessPolicy, _tds__SetAccessPolicyResponse &tds__SetAccessPolicyResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetAccessPolicy, "Device");
-}
-
-
-
-int DeviceBindingService::CreateCertificate(_tds__CreateCertificate *tds__CreateCertificate, _tds__CreateCertificateResponse &tds__CreateCertificateResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__CreateCertificate, "Device");
-}
-
-
-
-int DeviceBindingService::GetCertificates(_tds__GetCertificates *tds__GetCertificates, _tds__GetCertificatesResponse &tds__GetCertificatesResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetCertificates, "Device");
-}
-
-
-
-int DeviceBindingService::GetCertificatesStatus(_tds__GetCertificatesStatus *tds__GetCertificatesStatus, _tds__GetCertificatesStatusResponse &tds__GetCertificatesStatusResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetCertificatesStatus, "Device");
-}
-
-
-
-int DeviceBindingService::SetCertificatesStatus(_tds__SetCertificatesStatus *tds__SetCertificatesStatus, _tds__SetCertificatesStatusResponse &tds__SetCertificatesStatusResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetCertificatesStatus, "Device");
-}
-
-
-
-int DeviceBindingService::DeleteCertificates(_tds__DeleteCertificates *tds__DeleteCertificates, _tds__DeleteCertificatesResponse &tds__DeleteCertificatesResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__DeleteCertificates, "Device");
-}
-
-
-
-int DeviceBindingService::GetPkcs10Request(_tds__GetPkcs10Request *tds__GetPkcs10Request, _tds__GetPkcs10RequestResponse &tds__GetPkcs10RequestResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetPkcs10Request, "Device");
-}
-
-
-
-int DeviceBindingService::LoadCertificates(_tds__LoadCertificates *tds__LoadCertificates, _tds__LoadCertificatesResponse &tds__LoadCertificatesResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__LoadCertificates, "Device");
-}
-
-
-
-int DeviceBindingService::GetClientCertificateMode(_tds__GetClientCertificateMode *tds__GetClientCertificateMode, _tds__GetClientCertificateModeResponse &tds__GetClientCertificateModeResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetClientCertificateMode, "Device");
-}
-
-
-
-int DeviceBindingService::SetClientCertificateMode(_tds__SetClientCertificateMode *tds__SetClientCertificateMode, _tds__SetClientCertificateModeResponse &tds__SetClientCertificateModeResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetClientCertificateMode, "Device");
-}
-
-
-
-int DeviceBindingService::GetRelayOutputs(_tds__GetRelayOutputs *tds__GetRelayOutputs, _tds__GetRelayOutputsResponse &tds__GetRelayOutputsResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetRelayOutputs, "Device");
-}
-
-
-
-int DeviceBindingService::SetRelayOutputSettings(_tds__SetRelayOutputSettings *tds__SetRelayOutputSettings, _tds__SetRelayOutputSettingsResponse &tds__SetRelayOutputSettingsResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetRelayOutputSettings, "Device");
-}
-
-
-
-int DeviceBindingService::SetRelayOutputState(_tds__SetRelayOutputState *tds__SetRelayOutputState, _tds__SetRelayOutputStateResponse &tds__SetRelayOutputStateResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetRelayOutputState, "Device");
-}
-
-
-
-int DeviceBindingService::SendAuxiliaryCommand(_tds__SendAuxiliaryCommand *tds__SendAuxiliaryCommand, _tds__SendAuxiliaryCommandResponse &tds__SendAuxiliaryCommandResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SendAuxiliaryCommand, "Device");
-}
-
-
-
-int DeviceBindingService::GetCACertificates(_tds__GetCACertificates *tds__GetCACertificates, _tds__GetCACertificatesResponse &tds__GetCACertificatesResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetCACertificates, "Device");
-}
-
-
-
-int DeviceBindingService::LoadCertificateWithPrivateKey(_tds__LoadCertificateWithPrivateKey *tds__LoadCertificateWithPrivateKey, _tds__LoadCertificateWithPrivateKeyResponse &tds__LoadCertificateWithPrivateKeyResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__LoadCertificateWithPrivateKey, "Device");
-}
-
-
-
-int DeviceBindingService::GetCertificateInformation(_tds__GetCertificateInformation *tds__GetCertificateInformation, _tds__GetCertificateInformationResponse &tds__GetCertificateInformationResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetCertificateInformation, "Device");
-}
-
-
-
-int DeviceBindingService::LoadCACertificates(_tds__LoadCACertificates *tds__LoadCACertificates, _tds__LoadCACertificatesResponse &tds__LoadCACertificatesResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__LoadCACertificates, "Device");
-}
-
-
-
-int DeviceBindingService::CreateDot1XConfiguration(_tds__CreateDot1XConfiguration *tds__CreateDot1XConfiguration, _tds__CreateDot1XConfigurationResponse &tds__CreateDot1XConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__CreateDot1XConfiguration, "Device");
-}
-
-
-
-int DeviceBindingService::SetDot1XConfiguration(_tds__SetDot1XConfiguration *tds__SetDot1XConfiguration, _tds__SetDot1XConfigurationResponse &tds__SetDot1XConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetDot1XConfiguration, "Device");
-}
-
-
-
-int DeviceBindingService::GetDot1XConfiguration(_tds__GetDot1XConfiguration *tds__GetDot1XConfiguration, _tds__GetDot1XConfigurationResponse &tds__GetDot1XConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetDot1XConfiguration, "Device");
-}
-
-
-
-int DeviceBindingService::GetDot1XConfigurations(_tds__GetDot1XConfigurations *tds__GetDot1XConfigurations, _tds__GetDot1XConfigurationsResponse &tds__GetDot1XConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetDot1XConfigurations, "Device");
-}
-
-
-
-int DeviceBindingService::DeleteDot1XConfiguration(_tds__DeleteDot1XConfiguration *tds__DeleteDot1XConfiguration, _tds__DeleteDot1XConfigurationResponse &tds__DeleteDot1XConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__DeleteDot1XConfiguration, "Device");
-}
-
-
-
-int DeviceBindingService::GetDot11Capabilities(_tds__GetDot11Capabilities *tds__GetDot11Capabilities, _tds__GetDot11CapabilitiesResponse &tds__GetDot11CapabilitiesResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetDot11Capabilities, "Device");
-}
-
-
-
-int DeviceBindingService::GetDot11Status(_tds__GetDot11Status *tds__GetDot11Status, _tds__GetDot11StatusResponse &tds__GetDot11StatusResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetDot11Status, "Device");
-}
-
-
-
-int DeviceBindingService::ScanAvailableDot11Networks(_tds__ScanAvailableDot11Networks *tds__ScanAvailableDot11Networks, _tds__ScanAvailableDot11NetworksResponse &tds__ScanAvailableDot11NetworksResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__ScanAvailableDot11Networks, "Device");
-}
-
-
-
-int DeviceBindingService::GetSystemUris(_tds__GetSystemUris *tds__GetSystemUris, _tds__GetSystemUrisResponse &tds__GetSystemUrisResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetSystemUris, "Device");
-}
-
-
-
-int DeviceBindingService::StartFirmwareUpgrade(_tds__StartFirmwareUpgrade *tds__StartFirmwareUpgrade, _tds__StartFirmwareUpgradeResponse &tds__StartFirmwareUpgradeResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__StartFirmwareUpgrade, "Device");
-}
-
-
-
-int DeviceBindingService::StartSystemRestore(_tds__StartSystemRestore *tds__StartSystemRestore, _tds__StartSystemRestoreResponse &tds__StartSystemRestoreResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__StartSystemRestore, "Device");
-}
-
-
-
-int DeviceBindingService::GetStorageConfigurations(_tds__GetStorageConfigurations *tds__GetStorageConfigurations, _tds__GetStorageConfigurationsResponse &tds__GetStorageConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetStorageConfigurations, "Device");
-}
-
-
-
-int DeviceBindingService::CreateStorageConfiguration(_tds__CreateStorageConfiguration *tds__CreateStorageConfiguration, _tds__CreateStorageConfigurationResponse &tds__CreateStorageConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__CreateStorageConfiguration, "Device");
-}
-
-
-
-int DeviceBindingService::GetStorageConfiguration(_tds__GetStorageConfiguration *tds__GetStorageConfiguration, _tds__GetStorageConfigurationResponse &tds__GetStorageConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetStorageConfiguration, "Device");
-}
-
-
-
-
-int DeviceBindingService::SetStorageConfiguration(_tds__SetStorageConfiguration *tds__SetStorageConfiguration, _tds__SetStorageConfigurationResponse &tds__SetStorageConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetStorageConfiguration, "Device");
-}
-
-
-
-int DeviceBindingService::DeleteStorageConfiguration(_tds__DeleteStorageConfiguration *tds__DeleteStorageConfiguration, _tds__DeleteStorageConfigurationResponse &tds__DeleteStorageConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__DeleteStorageConfiguration, "Device");
-}
-
-
-
-int DeviceBindingService::GetGeoLocation(_tds__GetGeoLocation *tds__GetGeoLocation, _tds__GetGeoLocationResponse &tds__GetGeoLocationResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__GetGeoLocation, "Device");
-}
-
-
-
-int DeviceBindingService::SetGeoLocation(_tds__SetGeoLocation *tds__SetGeoLocation, _tds__SetGeoLocationResponse &tds__SetGeoLocationResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__SetGeoLocation, "Device");
-}
-
-
-
-int DeviceBindingService::DeleteGeoLocation(_tds__DeleteGeoLocation *tds__DeleteGeoLocation, _tds__DeleteGeoLocationResponse &tds__DeleteGeoLocationResponse)
-{
-    SOAP_EMPTY_HANDLER(tds__DeleteGeoLocation, "Device");
-}
diff --git a/src/onvif_srvd/onvif_srvd/src/ServiceMedia.cpp b/src/onvif_srvd/onvif_srvd/src/ServiceMedia.cpp
deleted file mode 100644
index e9e8f37..0000000
--- a/src/onvif_srvd/onvif_srvd/src/ServiceMedia.cpp
+++ /dev/null
@@ -1,885 +0,0 @@
-/*
- --------------------------------------------------------------------------
- ServiceMedia.cpp
-
- Implementation of functions (methods) for the service:
- ONVIF media.wsdl server side
------------------------------------------------------------------------------
-*/
-
-
-#include "soapMediaBindingService.h"
-#include "ServiceContext.h"
-#include "smacros.h"
-#include "stools.h"
-
-
-
-
-
-int MediaBindingService::GetServiceCapabilities(_trt__GetServiceCapabilities *trt__GetServiceCapabilities, _trt__GetServiceCapabilitiesResponse &trt__GetServiceCapabilitiesResponse)
-{
-    UNUSED(trt__GetServiceCapabilities);
-    DEBUG_MSG("Media: %s\n", __FUNCTION__);
-
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-    trt__GetServiceCapabilitiesResponse.Capabilities = ctx->getMediaServiceCapabilities(this->soap);
-
-
-    return SOAP_OK;
-}
-
-
-
-int MediaBindingService::GetVideoSources(_trt__GetVideoSources *trt__GetVideoSources, _trt__GetVideoSourcesResponse &trt__GetVideoSourcesResponse)
-{
-    UNUSED(trt__GetVideoSources);
-    DEBUG_MSG("Media: %s\n", __FUNCTION__);
-
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    auto profiles = ctx->get_profiles();
-
-
-    for( auto it = profiles.cbegin(); it != profiles.cend(); ++it )
-    {
-        trt__GetVideoSourcesResponse.VideoSources.push_back(it->second.get_video_src(this->soap));
-    }
-
-
-    return SOAP_OK;
-}
-
-
-
-int MediaBindingService::GetAudioSources(_trt__GetAudioSources *trt__GetAudioSources, _trt__GetAudioSourcesResponse &trt__GetAudioSourcesResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetAudioSources, "Media");
-}
-
-
-
-int MediaBindingService::GetAudioOutputs(_trt__GetAudioOutputs *trt__GetAudioOutputs, _trt__GetAudioOutputsResponse &trt__GetAudioOutputsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetAudioOutputs, "Media");
-}
-
-
-
-int MediaBindingService::CreateProfile(_trt__CreateProfile *trt__CreateProfile, _trt__CreateProfileResponse &trt__CreateProfileResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__CreateProfile, "Media");
-}
-
-
-
-int MediaBindingService::GetProfile(_trt__GetProfile *trt__GetProfile, _trt__GetProfileResponse &trt__GetProfileResponse)
-{
-    DEBUG_MSG("Media: %s   get profile:%s\n", __FUNCTION__, trt__GetProfile->ProfileToken.c_str());
-
-    int ret = SOAP_FAULT;
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-    auto profiles       = ctx->get_profiles();
-    auto it             = profiles.find(trt__GetProfile->ProfileToken);
-
-
-    if( it != profiles.end() )
-    {
-        trt__GetProfileResponse.Profile = it->second.get_profile(this->soap);
-        ret = SOAP_OK;
-    }
-
-
-    return ret;
-}
-
-
-
-int MediaBindingService::GetProfiles(_trt__GetProfiles *trt__GetProfiles, _trt__GetProfilesResponse &trt__GetProfilesResponse)
-{
-    UNUSED(trt__GetProfiles);
-    DEBUG_MSG("Media: %s\n", __FUNCTION__);
-
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    auto profiles = ctx->get_profiles();
-
-
-    for( auto it = profiles.cbegin(); it != profiles.cend(); ++it )
-    {
-        trt__GetProfilesResponse.Profiles.push_back(it->second.get_profile(this->soap));
-    }
-
-
-    return SOAP_OK;
-}
-
-
-
-int MediaBindingService::AddVideoEncoderConfiguration(_trt__AddVideoEncoderConfiguration *trt__AddVideoEncoderConfiguration, _trt__AddVideoEncoderConfigurationResponse &trt__AddVideoEncoderConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__AddVideoEncoderConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::AddVideoSourceConfiguration(_trt__AddVideoSourceConfiguration *trt__AddVideoSourceConfiguration, _trt__AddVideoSourceConfigurationResponse &trt__AddVideoSourceConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__AddVideoSourceConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::AddAudioEncoderConfiguration(_trt__AddAudioEncoderConfiguration *trt__AddAudioEncoderConfiguration, _trt__AddAudioEncoderConfigurationResponse &trt__AddAudioEncoderConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__AddAudioEncoderConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::AddAudioSourceConfiguration(_trt__AddAudioSourceConfiguration *trt__AddAudioSourceConfiguration, _trt__AddAudioSourceConfigurationResponse &trt__AddAudioSourceConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__AddAudioSourceConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::AddPTZConfiguration(_trt__AddPTZConfiguration *trt__AddPTZConfiguration, _trt__AddPTZConfigurationResponse &trt__AddPTZConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__AddPTZConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::AddVideoAnalyticsConfiguration(_trt__AddVideoAnalyticsConfiguration *trt__AddVideoAnalyticsConfiguration, _trt__AddVideoAnalyticsConfigurationResponse &trt__AddVideoAnalyticsConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__AddVideoAnalyticsConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::AddMetadataConfiguration(_trt__AddMetadataConfiguration *trt__AddMetadataConfiguration, _trt__AddMetadataConfigurationResponse &trt__AddMetadataConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__AddMetadataConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::AddAudioOutputConfiguration(_trt__AddAudioOutputConfiguration *trt__AddAudioOutputConfiguration, _trt__AddAudioOutputConfigurationResponse &trt__AddAudioOutputConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__AddAudioOutputConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::AddAudioDecoderConfiguration(_trt__AddAudioDecoderConfiguration *trt__AddAudioDecoderConfiguration, _trt__AddAudioDecoderConfigurationResponse &trt__AddAudioDecoderConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__AddAudioDecoderConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::RemoveVideoEncoderConfiguration(_trt__RemoveVideoEncoderConfiguration *trt__RemoveVideoEncoderConfiguration, _trt__RemoveVideoEncoderConfigurationResponse &trt__RemoveVideoEncoderConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__RemoveVideoEncoderConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::RemoveVideoSourceConfiguration(_trt__RemoveVideoSourceConfiguration *trt__RemoveVideoSourceConfiguration, _trt__RemoveVideoSourceConfigurationResponse &trt__RemoveVideoSourceConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__RemoveVideoSourceConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::RemoveAudioEncoderConfiguration(_trt__RemoveAudioEncoderConfiguration *trt__RemoveAudioEncoderConfiguration, _trt__RemoveAudioEncoderConfigurationResponse &trt__RemoveAudioEncoderConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__RemoveAudioEncoderConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::RemoveAudioSourceConfiguration(_trt__RemoveAudioSourceConfiguration *trt__RemoveAudioSourceConfiguration, _trt__RemoveAudioSourceConfigurationResponse &trt__RemoveAudioSourceConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__RemoveAudioSourceConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::RemovePTZConfiguration(_trt__RemovePTZConfiguration *trt__RemovePTZConfiguration, _trt__RemovePTZConfigurationResponse &trt__RemovePTZConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__RemovePTZConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::RemoveVideoAnalyticsConfiguration(_trt__RemoveVideoAnalyticsConfiguration *trt__RemoveVideoAnalyticsConfiguration, _trt__RemoveVideoAnalyticsConfigurationResponse &trt__RemoveVideoAnalyticsConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__RemoveVideoAnalyticsConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::RemoveMetadataConfiguration(_trt__RemoveMetadataConfiguration *trt__RemoveMetadataConfiguration, _trt__RemoveMetadataConfigurationResponse &trt__RemoveMetadataConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__RemoveMetadataConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::RemoveAudioOutputConfiguration(_trt__RemoveAudioOutputConfiguration *trt__RemoveAudioOutputConfiguration, _trt__RemoveAudioOutputConfigurationResponse &trt__RemoveAudioOutputConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__RemoveAudioOutputConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::RemoveAudioDecoderConfiguration(_trt__RemoveAudioDecoderConfiguration *trt__RemoveAudioDecoderConfiguration, _trt__RemoveAudioDecoderConfigurationResponse &trt__RemoveAudioDecoderConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__RemoveAudioDecoderConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::DeleteProfile(_trt__DeleteProfile *trt__DeleteProfile, _trt__DeleteProfileResponse &trt__DeleteProfileResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__DeleteProfile, "Media");
-}
-
-
-
-int MediaBindingService::GetVideoSourceConfigurations(_trt__GetVideoSourceConfigurations *trt__GetVideoSourceConfigurations, _trt__GetVideoSourceConfigurationsResponse &trt__GetVideoSourceConfigurationsResponse)
-{
-    UNUSED(trt__GetVideoSourceConfigurations);
-    DEBUG_MSG("Media: %s\n", __FUNCTION__);
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    auto profiles = ctx->get_profiles();
-
-    for( auto it = profiles.cbegin(); it != profiles.cend(); ++it )
-    {
-        tt__VideoSourceConfiguration *vsc = it->second.get_video_src_cnf(this->soap);
-        trt__GetVideoSourceConfigurationsResponse.Configurations.push_back(vsc);
-    }
-
-    return SOAP_OK;
-}
-
-
-
-int MediaBindingService::GetVideoEncoderConfigurations(_trt__GetVideoEncoderConfigurations *trt__GetVideoEncoderConfigurations, _trt__GetVideoEncoderConfigurationsResponse &trt__GetVideoEncoderConfigurationsResponse)
-{
-    UNUSED(trt__GetVideoEncoderConfigurations);
-    DEBUG_MSG("Media: %s\n", __FUNCTION__);
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    auto profiles = ctx->get_profiles();
-
-    for( auto it = profiles.cbegin(); it != profiles.cend(); ++it )
-    {
-        tt__VideoEncoderConfiguration *vec = it->second.get_video_enc_cfg(this->soap);
-        trt__GetVideoEncoderConfigurationsResponse.Configurations.push_back(vec);
-    }
-
-    return SOAP_OK;
-}
-
-
-
-int MediaBindingService::GetAudioSourceConfigurations(_trt__GetAudioSourceConfigurations *trt__GetAudioSourceConfigurations, _trt__GetAudioSourceConfigurationsResponse &trt__GetAudioSourceConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetAudioSourceConfigurations, "Media");
-}
-
-
-
-int MediaBindingService::GetAudioEncoderConfigurations(_trt__GetAudioEncoderConfigurations *trt__GetAudioEncoderConfigurations, _trt__GetAudioEncoderConfigurationsResponse &trt__GetAudioEncoderConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetAudioEncoderConfigurations, "Media");
-}
-
-
-
-int MediaBindingService::GetVideoAnalyticsConfigurations(_trt__GetVideoAnalyticsConfigurations *trt__GetVideoAnalyticsConfigurations, _trt__GetVideoAnalyticsConfigurationsResponse &trt__GetVideoAnalyticsConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetVideoAnalyticsConfigurations, "Media");
-}
-
-
-
-int MediaBindingService::GetMetadataConfigurations(_trt__GetMetadataConfigurations *trt__GetMetadataConfigurations, _trt__GetMetadataConfigurationsResponse &trt__GetMetadataConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetMetadataConfigurations, "Media");
-}
-
-
-
-int MediaBindingService::GetAudioOutputConfigurations(_trt__GetAudioOutputConfigurations *trt__GetAudioOutputConfigurations, _trt__GetAudioOutputConfigurationsResponse &trt__GetAudioOutputConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetAudioOutputConfigurations, "Media");
-}
-
-
-
-int MediaBindingService::GetAudioDecoderConfigurations(_trt__GetAudioDecoderConfigurations *trt__GetAudioDecoderConfigurations, _trt__GetAudioDecoderConfigurationsResponse &trt__GetAudioDecoderConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetAudioDecoderConfigurations, "Media");
-}
-
-
-
-int MediaBindingService::GetVideoSourceConfiguration(_trt__GetVideoSourceConfiguration *trt__GetVideoSourceConfiguration, _trt__GetVideoSourceConfigurationResponse &trt__GetVideoSourceConfigurationResponse)
-{
-    DEBUG_MSG("Media: %s\n", __FUNCTION__);
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    auto profiles = ctx->get_profiles();
-
-    for( auto it = profiles.cbegin(); it != profiles.cend(); ++it )
-    {
-        if (trt__GetVideoSourceConfiguration->ConfigurationToken == it->second.get_video_src_cnf(this->soap)->token) {
-            tt__VideoSourceConfiguration *vsc = it->second.get_video_src_cnf(this->soap);
-            trt__GetVideoSourceConfigurationResponse.Configuration = vsc;
-            break;
-        }
-    }
-
-    return SOAP_OK;
-}
-
-
-
-int MediaBindingService::GetVideoEncoderConfiguration(_trt__GetVideoEncoderConfiguration *trt__GetVideoEncoderConfiguration, _trt__GetVideoEncoderConfigurationResponse &trt__GetVideoEncoderConfigurationResponse)
-{
-    DEBUG_MSG("Media: %s\n", __FUNCTION__);
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    auto profiles = ctx->get_profiles();
-
-    for( auto it = profiles.cbegin(); it != profiles.cend(); ++it )
-    {
-        if (trt__GetVideoEncoderConfiguration->ConfigurationToken == it->second.get_video_enc_cfg(this->soap)->token) {
-            tt__VideoEncoderConfiguration *vec = it->second.get_video_enc_cfg(this->soap);
-            trt__GetVideoEncoderConfigurationResponse.Configuration = vec;
-            break;
-        }
-    }
-
-    return SOAP_OK;
-}
-
-
-
-int MediaBindingService::GetAudioSourceConfiguration(_trt__GetAudioSourceConfiguration *trt__GetAudioSourceConfiguration, _trt__GetAudioSourceConfigurationResponse &trt__GetAudioSourceConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetAudioSourceConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::GetAudioEncoderConfiguration(_trt__GetAudioEncoderConfiguration *trt__GetAudioEncoderConfiguration, _trt__GetAudioEncoderConfigurationResponse &trt__GetAudioEncoderConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetAudioEncoderConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::GetVideoAnalyticsConfiguration(_trt__GetVideoAnalyticsConfiguration *trt__GetVideoAnalyticsConfiguration, _trt__GetVideoAnalyticsConfigurationResponse &trt__GetVideoAnalyticsConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetVideoAnalyticsConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::GetMetadataConfiguration(_trt__GetMetadataConfiguration *trt__GetMetadataConfiguration, _trt__GetMetadataConfigurationResponse &trt__GetMetadataConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetMetadataConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::GetAudioOutputConfiguration(_trt__GetAudioOutputConfiguration *trt__GetAudioOutputConfiguration, _trt__GetAudioOutputConfigurationResponse &trt__GetAudioOutputConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetAudioOutputConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::GetAudioDecoderConfiguration(_trt__GetAudioDecoderConfiguration *trt__GetAudioDecoderConfiguration, _trt__GetAudioDecoderConfigurationResponse &trt__GetAudioDecoderConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetAudioDecoderConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::GetCompatibleVideoEncoderConfigurations(_trt__GetCompatibleVideoEncoderConfigurations *trt__GetCompatibleVideoEncoderConfigurations, _trt__GetCompatibleVideoEncoderConfigurationsResponse &trt__GetCompatibleVideoEncoderConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetCompatibleVideoEncoderConfigurations, "Media");
-}
-
-
-
-int MediaBindingService::GetCompatibleVideoSourceConfigurations(_trt__GetCompatibleVideoSourceConfigurations *trt__GetCompatibleVideoSourceConfigurations, _trt__GetCompatibleVideoSourceConfigurationsResponse &trt__GetCompatibleVideoSourceConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetCompatibleVideoSourceConfigurations, "Media");
-}
-
-
-
-int MediaBindingService::GetCompatibleAudioEncoderConfigurations(_trt__GetCompatibleAudioEncoderConfigurations *trt__GetCompatibleAudioEncoderConfigurations, _trt__GetCompatibleAudioEncoderConfigurationsResponse &trt__GetCompatibleAudioEncoderConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetCompatibleAudioEncoderConfigurations, "Media");
-}
-
-
-
-int MediaBindingService::GetCompatibleAudioSourceConfigurations(_trt__GetCompatibleAudioSourceConfigurations *trt__GetCompatibleAudioSourceConfigurations, _trt__GetCompatibleAudioSourceConfigurationsResponse &trt__GetCompatibleAudioSourceConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetCompatibleAudioSourceConfigurations, "Media");
-}
-
-
-
-int MediaBindingService::GetCompatibleVideoAnalyticsConfigurations(_trt__GetCompatibleVideoAnalyticsConfigurations *trt__GetCompatibleVideoAnalyticsConfigurations, _trt__GetCompatibleVideoAnalyticsConfigurationsResponse &trt__GetCompatibleVideoAnalyticsConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetCompatibleVideoAnalyticsConfigurations, "Media");
-}
-
-
-
-int MediaBindingService::GetCompatibleMetadataConfigurations(_trt__GetCompatibleMetadataConfigurations *trt__GetCompatibleMetadataConfigurations, _trt__GetCompatibleMetadataConfigurationsResponse &trt__GetCompatibleMetadataConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetCompatibleMetadataConfigurations, "Media");
-}
-
-
-
-int MediaBindingService::GetCompatibleAudioOutputConfigurations(_trt__GetCompatibleAudioOutputConfigurations *trt__GetCompatibleAudioOutputConfigurations, _trt__GetCompatibleAudioOutputConfigurationsResponse &trt__GetCompatibleAudioOutputConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetCompatibleAudioOutputConfigurations, "Media");
-}
-
-
-
-int MediaBindingService::GetCompatibleAudioDecoderConfigurations(_trt__GetCompatibleAudioDecoderConfigurations *trt__GetCompatibleAudioDecoderConfigurations, _trt__GetCompatibleAudioDecoderConfigurationsResponse &trt__GetCompatibleAudioDecoderConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetCompatibleAudioDecoderConfigurations, "Media");
-}
-
-
-
-int MediaBindingService::SetVideoSourceConfiguration(_trt__SetVideoSourceConfiguration *trt__SetVideoSourceConfiguration, _trt__SetVideoSourceConfigurationResponse &trt__SetVideoSourceConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__SetVideoSourceConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::SetVideoEncoderConfiguration(_trt__SetVideoEncoderConfiguration *trt__SetVideoEncoderConfiguration, _trt__SetVideoEncoderConfigurationResponse &trt__SetVideoEncoderConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__SetVideoEncoderConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::SetAudioSourceConfiguration(_trt__SetAudioSourceConfiguration *trt__SetAudioSourceConfiguration, _trt__SetAudioSourceConfigurationResponse &trt__SetAudioSourceConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__SetAudioSourceConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::SetAudioEncoderConfiguration(_trt__SetAudioEncoderConfiguration *trt__SetAudioEncoderConfiguration, _trt__SetAudioEncoderConfigurationResponse &trt__SetAudioEncoderConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__SetAudioEncoderConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::SetVideoAnalyticsConfiguration(_trt__SetVideoAnalyticsConfiguration *trt__SetVideoAnalyticsConfiguration, _trt__SetVideoAnalyticsConfigurationResponse &trt__SetVideoAnalyticsConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__SetVideoAnalyticsConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::SetMetadataConfiguration(_trt__SetMetadataConfiguration *trt__SetMetadataConfiguration, _trt__SetMetadataConfigurationResponse &trt__SetMetadataConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__SetMetadataConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::SetAudioOutputConfiguration(_trt__SetAudioOutputConfiguration *trt__SetAudioOutputConfiguration, _trt__SetAudioOutputConfigurationResponse &trt__SetAudioOutputConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__SetAudioOutputConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::SetAudioDecoderConfiguration(_trt__SetAudioDecoderConfiguration *trt__SetAudioDecoderConfiguration, _trt__SetAudioDecoderConfigurationResponse &trt__SetAudioDecoderConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__SetAudioDecoderConfiguration, "Media");
-}
-
-
-
-int MediaBindingService::GetVideoSourceConfigurationOptions(_trt__GetVideoSourceConfigurationOptions *trt__GetVideoSourceConfigurationOptions, _trt__GetVideoSourceConfigurationOptionsResponse &trt__GetVideoSourceConfigurationOptionsResponse)
-{
-    DEBUG_MSG("Media: %s\n", __FUNCTION__);
-
-    std::string token;
-    int width;
-    int height;
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    auto profiles = ctx->get_profiles();
-
-    if (trt__GetVideoSourceConfigurationOptions->ConfigurationToken != NULL) {
-        for( auto it = profiles.cbegin(); it != profiles.cend(); ++it )
-        {
-            if (*(trt__GetVideoSourceConfigurationOptions->ConfigurationToken) == it->second.get_video_enc_cfg(this->soap)->token) {
-                token.assign(it->second.get_video_enc_cfg(this->soap)->token);
-            }
-        }
-    } else if (trt__GetVideoSourceConfigurationOptions->ProfileToken != NULL) {
-        for( auto it = profiles.cbegin(); it != profiles.cend(); ++it )
-        {
-            if (*(trt__GetVideoSourceConfigurationOptions->ProfileToken) == it->second.get_video_src_cnf(this->soap)->token) {
-                token.assign(it->second.get_video_src_cnf(this->soap)->token);
-            }
-        }
-    }
-
-    for( auto it = profiles.cbegin(); it != profiles.cend(); ++it )
-    {
-        if ((token.empty()) || (token == it->second.get_video_src_cnf(this->soap)->token)) {
-            width = it->second.get_width();
-            height = it->second.get_height();
-
-            trt__GetVideoSourceConfigurationOptionsResponse.Options = soap_new_tt__VideoSourceConfigurationOptions(soap);
-
-            trt__GetVideoSourceConfigurationOptionsResponse.Options->BoundsRange = soap_new_tt__IntRectangleRange(soap);
-            trt__GetVideoSourceConfigurationOptionsResponse.Options->BoundsRange->XRange = soap_new_tt__IntRange(soap);
-            trt__GetVideoSourceConfigurationOptionsResponse.Options->BoundsRange->XRange->Min = 0; //dummy
-            trt__GetVideoSourceConfigurationOptionsResponse.Options->BoundsRange->XRange->Max = width; //dummy
-            trt__GetVideoSourceConfigurationOptionsResponse.Options->BoundsRange->YRange = soap_new_tt__IntRange(soap);
-            trt__GetVideoSourceConfigurationOptionsResponse.Options->BoundsRange->YRange->Min = 0; //dummy
-            trt__GetVideoSourceConfigurationOptionsResponse.Options->BoundsRange->YRange->Max = height; //dummy
-            trt__GetVideoSourceConfigurationOptionsResponse.Options->BoundsRange->WidthRange = soap_new_tt__IntRange(soap);
-            trt__GetVideoSourceConfigurationOptionsResponse.Options->BoundsRange->WidthRange->Min = 0; //dummy
-            trt__GetVideoSourceConfigurationOptionsResponse.Options->BoundsRange->WidthRange->Max = width; //dummy
-            trt__GetVideoSourceConfigurationOptionsResponse.Options->BoundsRange->HeightRange = soap_new_tt__IntRange(soap);
-            trt__GetVideoSourceConfigurationOptionsResponse.Options->BoundsRange->HeightRange->Min = 0; //dummy
-            trt__GetVideoSourceConfigurationOptionsResponse.Options->BoundsRange->HeightRange->Max = height; //dummy
-
-            trt__GetVideoSourceConfigurationOptionsResponse.Options->VideoSourceTokensAvailable.push_back(it->second.get_video_src_cnf(this->soap)->token);
-
-            break;
-        }
-    }
-
-    return SOAP_OK;
-}
-
-
-
-int MediaBindingService::GetVideoEncoderConfigurationOptions(_trt__GetVideoEncoderConfigurationOptions *trt__GetVideoEncoderConfigurationOptions, _trt__GetVideoEncoderConfigurationOptionsResponse &trt__GetVideoEncoderConfigurationOptionsResponse)
-{
-    DEBUG_MSG("Media: %s\n", __FUNCTION__);
-
-    std::string token;
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    auto profiles = ctx->get_profiles();
-
-    if (trt__GetVideoEncoderConfigurationOptions->ConfigurationToken != NULL) {
-        for( auto it = profiles.cbegin(); it != profiles.cend(); ++it )
-        {
-            if (*(trt__GetVideoEncoderConfigurationOptions->ConfigurationToken) == it->second.get_video_enc_cfg(this->soap)->token) {
-                token.assign(it->second.get_video_enc_cfg(this->soap)->token);
-            }
-        }
-    } else if (trt__GetVideoEncoderConfigurationOptions->ProfileToken != NULL) {
-        for( auto it = profiles.cbegin(); it != profiles.cend(); ++it )
-        {
-            if (*(trt__GetVideoEncoderConfigurationOptions->ProfileToken) == it->second.get_video_src_cnf(this->soap)->token) {
-                token.assign(it->second.get_video_src_cnf(this->soap)->token);
-            }
-        }
-    }
-
-    trt__GetVideoEncoderConfigurationOptionsResponse.Options  = soap_new_tt__VideoEncoderConfigurationOptions(soap);
-    trt__GetVideoEncoderConfigurationOptionsResponse.Options->JPEG  = NULL;
-    trt__GetVideoEncoderConfigurationOptionsResponse.Options->MPEG4 = NULL;
-    trt__GetVideoEncoderConfigurationOptionsResponse.Options->H264  = NULL;
-    trt__GetVideoEncoderConfigurationOptionsResponse.Options->QualityRange  = soap_new_tt__IntRange(soap);
-    trt__GetVideoEncoderConfigurationOptionsResponse.Options->QualityRange->Min = 0; //dummy
-    trt__GetVideoEncoderConfigurationOptionsResponse.Options->QualityRange->Max = 100; //dummy
-    trt__GetVideoEncoderConfigurationOptionsResponse.Options->Extension  = NULL;
-
-    for( auto it = profiles.cbegin(); it != profiles.cend(); ++it ) {
-        if ((token.empty()) || (token == it->second.get_video_src_cnf(this->soap)->token)) {
-            if (it->second.get_type() == tt__VideoEncoding__JPEG) {
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->JPEG  = soap_new_tt__JpegOptions(soap);
-
-                tt__VideoResolution *vr = soap_new_tt__VideoResolution(soap);
-                vr->Width = it->second.get_width();
-                vr->Height = it->second.get_height();
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->JPEG->ResolutionsAvailable.push_back(vr);
-
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->JPEG->FrameRateRange  = soap_new_tt__IntRange(soap);
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->JPEG->FrameRateRange->Min = 0; //dummy
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->JPEG->FrameRateRange->Max = 20; //dummy
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->JPEG->EncodingIntervalRange  = soap_new_tt__IntRange(soap);
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->JPEG->EncodingIntervalRange->Min = 0; //dummy
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->JPEG->EncodingIntervalRange->Max = 3; //dummy
-            } else if (it->second.get_type() == tt__VideoEncoding__MPEG4) {
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->MPEG4  = soap_new_tt__Mpeg4Options(soap);
-
-                tt__VideoResolution *vr = soap_new_tt__VideoResolution(soap);
-                vr->Width = it->second.get_width();
-                vr->Height = it->second.get_height();
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->MPEG4->ResolutionsAvailable.push_back(vr);
-
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->MPEG4->GovLengthRange  = soap_new_tt__IntRange(soap);
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->MPEG4->GovLengthRange->Min = 0; //dummy
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->MPEG4->GovLengthRange->Max = 40; //dummy
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->MPEG4->FrameRateRange  = soap_new_tt__IntRange(soap);
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->MPEG4->FrameRateRange->Min = 0; //dummy
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->MPEG4->FrameRateRange->Max = 20; //dummy
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->MPEG4->EncodingIntervalRange  = soap_new_tt__IntRange(soap);
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->MPEG4->EncodingIntervalRange->Min = 0; //dummy
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->MPEG4->EncodingIntervalRange->Max = 3; //dummy
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->MPEG4->Mpeg4ProfilesSupported.push_back(tt__Mpeg4Profile__SP);
-            } else if (it->second.get_type() == tt__VideoEncoding__H264) {
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->H264 = soap_new_tt__H264Options(soap);
-
-                tt__VideoResolution *vr = soap_new_tt__VideoResolution(soap);
-                vr->Width = it->second.get_width();
-                vr->Height = it->second.get_height();
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->H264->ResolutionsAvailable.push_back(vr);
-
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->H264->GovLengthRange  = soap_new_tt__IntRange(soap);
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->H264->GovLengthRange->Min = 0; //dummy
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->H264->GovLengthRange->Max = 40; //dummy
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->H264->FrameRateRange  = soap_new_tt__IntRange(soap);
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->H264->FrameRateRange->Min = 0; //dummy
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->H264->FrameRateRange->Max = 20; //dummy
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->H264->EncodingIntervalRange  = soap_new_tt__IntRange(soap);
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->H264->EncodingIntervalRange->Min = 0; //dummy
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->H264->EncodingIntervalRange->Max = 3; //dummy
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->H264->H264ProfilesSupported.push_back(tt__H264Profile__Main);
-                trt__GetVideoEncoderConfigurationOptionsResponse.Options->H264->H264ProfilesSupported.push_back(tt__H264Profile__Main);
-            }
-        }
-    }
-
-
-    return SOAP_OK; 
-}
-
-
-
-int MediaBindingService::GetAudioSourceConfigurationOptions(_trt__GetAudioSourceConfigurationOptions *trt__GetAudioSourceConfigurationOptions, _trt__GetAudioSourceConfigurationOptionsResponse &trt__GetAudioSourceConfigurationOptionsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetAudioSourceConfigurationOptions, "Media");
-}
-
-
-
-int MediaBindingService::GetAudioEncoderConfigurationOptions(_trt__GetAudioEncoderConfigurationOptions *trt__GetAudioEncoderConfigurationOptions, _trt__GetAudioEncoderConfigurationOptionsResponse &trt__GetAudioEncoderConfigurationOptionsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetAudioEncoderConfigurationOptions, "Media");
-}
-
-
-
-int MediaBindingService::GetMetadataConfigurationOptions(_trt__GetMetadataConfigurationOptions *trt__GetMetadataConfigurationOptions, _trt__GetMetadataConfigurationOptionsResponse &trt__GetMetadataConfigurationOptionsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetMetadataConfigurationOptions, "Media");
-}
-
-
-
-int MediaBindingService::GetAudioOutputConfigurationOptions(_trt__GetAudioOutputConfigurationOptions *trt__GetAudioOutputConfigurationOptions, _trt__GetAudioOutputConfigurationOptionsResponse &trt__GetAudioOutputConfigurationOptionsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetAudioOutputConfigurationOptions, "Media");
-}
-
-
-
-int MediaBindingService::GetAudioDecoderConfigurationOptions(_trt__GetAudioDecoderConfigurationOptions *trt__GetAudioDecoderConfigurationOptions, _trt__GetAudioDecoderConfigurationOptionsResponse &trt__GetAudioDecoderConfigurationOptionsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetAudioDecoderConfigurationOptions, "Media");
-}
-
-
-
-int MediaBindingService::GetGuaranteedNumberOfVideoEncoderInstances(_trt__GetGuaranteedNumberOfVideoEncoderInstances *trt__GetGuaranteedNumberOfVideoEncoderInstances, _trt__GetGuaranteedNumberOfVideoEncoderInstancesResponse &trt__GetGuaranteedNumberOfVideoEncoderInstancesResponse)
-{
-    UNUSED(trt__GetGuaranteedNumberOfVideoEncoderInstances);
-    DEBUG_MSG("Media: %s\n", __FUNCTION__);
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    auto profiles = ctx->get_profiles();
-
-    int instancesNumber = 3;
-    int jpegInstancesNumber = 0;
-    int mpeg4InstancesNumber = 0;
-    int h264InstancesNumber = 0;
-
-    for( auto it = profiles.cbegin(); it != profiles.cend(); ++it )
-    {
-        if (it->second.get_type() == tt__VideoEncoding__JPEG) {
-            jpegInstancesNumber += instancesNumber;
-        } else if (it->second.get_type() == tt__VideoEncoding__MPEG4) {
-            mpeg4InstancesNumber += instancesNumber;
-        } else if (it->second.get_type() == tt__VideoEncoding__H264) {
-            h264InstancesNumber += instancesNumber;
-        }
-    }
-
-    trt__GetGuaranteedNumberOfVideoEncoderInstancesResponse.TotalNumber = jpegInstancesNumber + mpeg4InstancesNumber + h264InstancesNumber;
-    trt__GetGuaranteedNumberOfVideoEncoderInstancesResponse.JPEG = soap_new_ptr(soap, jpegInstancesNumber);
-    trt__GetGuaranteedNumberOfVideoEncoderInstancesResponse.MPEG4 = soap_new_ptr(soap, mpeg4InstancesNumber);
-    trt__GetGuaranteedNumberOfVideoEncoderInstancesResponse.H264 = soap_new_ptr(soap, h264InstancesNumber);
-
-    return SOAP_OK;
-}
-
-
-
-int MediaBindingService::GetStreamUri(_trt__GetStreamUri *trt__GetStreamUri, _trt__GetStreamUriResponse &trt__GetStreamUriResponse)
-{
-    DEBUG_MSG("Media: %s   for profile:%s\n", __FUNCTION__, trt__GetStreamUri->ProfileToken.c_str());
-
-
-    int ret = SOAP_FAULT;
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-    auto profiles       = ctx->get_profiles();
-    auto it             = profiles.find(trt__GetStreamUri->ProfileToken);
-
-
-    if( it != profiles.end() )
-    {
-        trt__GetStreamUriResponse.MediaUri = soap_new_tt__MediaUri(this->soap);
-        trt__GetStreamUriResponse.MediaUri->Uri = ctx->get_stream_uri(it->second.get_url(), htonl(this->soap->ip));
-        ret = SOAP_OK;
-    }
-
-
-    return ret;
-}
-
-
-
-int MediaBindingService::StartMulticastStreaming(_trt__StartMulticastStreaming *trt__StartMulticastStreaming, _trt__StartMulticastStreamingResponse &trt__StartMulticastStreamingResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__StartMulticastStreaming, "Media");
-}
-
-
-
-int MediaBindingService::StopMulticastStreaming(_trt__StopMulticastStreaming *trt__StopMulticastStreaming, _trt__StopMulticastStreamingResponse &trt__StopMulticastStreamingResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__StopMulticastStreaming, "Media");
-}
-
-
-
-int MediaBindingService::SetSynchronizationPoint(_trt__SetSynchronizationPoint *trt__SetSynchronizationPoint, _trt__SetSynchronizationPointResponse &trt__SetSynchronizationPointResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__SetSynchronizationPoint, "Media");
-}
-
-
-
-int MediaBindingService::GetSnapshotUri(_trt__GetSnapshotUri *trt__GetSnapshotUri, _trt__GetSnapshotUriResponse &trt__GetSnapshotUriResponse)
-{
-    DEBUG_MSG("Media: %s   for profile:%s\n", __FUNCTION__, trt__GetSnapshotUri->ProfileToken.c_str());
-
-
-    int ret = SOAP_FAULT;
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-    auto profiles       = ctx->get_profiles();
-    auto it             = profiles.find(trt__GetSnapshotUri->ProfileToken);
-
-    if( it != profiles.end() )
-    {
-        trt__GetSnapshotUriResponse.MediaUri = soap_new_tt__MediaUri(this->soap);
-        trt__GetSnapshotUriResponse.MediaUri->Uri = ctx->get_snapshot_uri(it->second.get_snapurl(), htonl(this->soap->ip));
-        ret = SOAP_OK;
-    }
-
-
-    return ret;
-}
-
-
-
-int MediaBindingService::GetVideoSourceModes(_trt__GetVideoSourceModes *trt__GetVideoSourceModes, _trt__GetVideoSourceModesResponse &trt__GetVideoSourceModesResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetVideoSourceModes, "Media");
-}
-
-
-
-int MediaBindingService::SetVideoSourceMode(_trt__SetVideoSourceMode *trt__SetVideoSourceMode, _trt__SetVideoSourceModeResponse &trt__SetVideoSourceModeResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__SetVideoSourceMode, "Media");
-}
-
-
-
-int MediaBindingService::GetOSDs(_trt__GetOSDs *trt__GetOSDs, _trt__GetOSDsResponse &trt__GetOSDsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetOSDs, "Media");
-}
-
-
-
-int MediaBindingService::GetOSD(_trt__GetOSD *trt__GetOSD, _trt__GetOSDResponse &trt__GetOSDResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetOSD, "Media");
-}
-
-
-
-int MediaBindingService::GetOSDOptions(_trt__GetOSDOptions *trt__GetOSDOptions, _trt__GetOSDOptionsResponse &trt__GetOSDOptionsResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__GetOSDOptions, "Media");
-}
-
-
-
-int MediaBindingService::SetOSD(_trt__SetOSD *trt__SetOSD, _trt__SetOSDResponse &trt__SetOSDResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__SetOSD, "Media");
-}
-
-
-
-int MediaBindingService::CreateOSD(_trt__CreateOSD *trt__CreateOSD, _trt__CreateOSDResponse &trt__CreateOSDResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__CreateOSD, "Media");
-}
-
-
-
-int MediaBindingService::DeleteOSD(_trt__DeleteOSD *trt__DeleteOSD, _trt__DeleteOSDResponse &trt__DeleteOSDResponse)
-{
-    SOAP_EMPTY_HANDLER(trt__DeleteOSD, "Media");
-}
diff --git a/src/onvif_srvd/onvif_srvd/src/ServicePTZ.cpp b/src/onvif_srvd/onvif_srvd/src/ServicePTZ.cpp
deleted file mode 100644
index 0e174aa..0000000
--- a/src/onvif_srvd/onvif_srvd/src/ServicePTZ.cpp
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- --------------------------------------------------------------------------
- ServicePTZ.cpp
-
- Implementation of functions (methods) for the service:
- ONVIF ptz.wsdl server side
------------------------------------------------------------------------------
-*/
-
-
-#include <sstream>
-#include "soapPTZBindingService.h"
-#include "ServiceContext.h"
-#include "smacros.h"
-
-
-
-
-
-int PTZBindingService::GetServiceCapabilities(_tptz__GetServiceCapabilities *tptz__GetServiceCapabilities, _tptz__GetServiceCapabilitiesResponse &tptz__GetServiceCapabilitiesResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__GetServiceCapabilities, "PTZ");
-}
-
-
-
-int PTZBindingService::GetConfigurations(_tptz__GetConfigurations *tptz__GetConfigurations, _tptz__GetConfigurationsResponse &tptz__GetConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__GetConfigurations, "PTZ");
-}
-
-
-
-int GetPTZPreset(struct soap *soap, tt__PTZPreset* ptzp, int number)
-{
-    std::stringstream stream;
-
-    stream << number;
-    ptzp->token = soap_new_std__string(soap);
-    *ptzp->token = stream.str();
-    ptzp->Name = soap_new_std__string(soap);
-    *ptzp->Name  = stream.str();
-
-    ptzp->PTZPosition             = soap_new_tt__PTZVector(soap);
-    ptzp->PTZPosition->PanTilt    = soap_new_req_tt__Vector2D(soap, 0.0f, 0.0f);
-    ptzp->PTZPosition->Zoom       = soap_new_req_tt__Vector1D(soap, 1.0f);
-
-    return SOAP_OK;
-}
-
-
-
-int PTZBindingService::GetPresets(_tptz__GetPresets *tptz__GetPresets, _tptz__GetPresetsResponse &tptz__GetPresetsResponse)
-{
-    UNUSED(tptz__GetPresets);
-    DEBUG_MSG("PTZ: %s\n", __FUNCTION__);
-
-
-    soap_default_std__vectorTemplateOfPointerTott__PTZPreset(soap, &tptz__GetPresetsResponse._tptz__GetPresetsResponse::Preset);
-    for (int i = 0; i < 8; i++) {
-        tt__PTZPreset* ptzp;
-        ptzp = soap_new_tt__PTZPreset(soap);
-        tptz__GetPresetsResponse.Preset.push_back(ptzp);
-        GetPTZPreset(this->soap, ptzp, i);
-    }
-
-    return SOAP_OK;
-}
-
-
-
-int PTZBindingService::SetPreset(_tptz__SetPreset *tptz__SetPreset, _tptz__SetPresetResponse &tptz__SetPresetResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__SetPreset, "PTZ");
-}
-
-
-
-int PTZBindingService::RemovePreset(_tptz__RemovePreset *tptz__RemovePreset, _tptz__RemovePresetResponse &tptz__RemovePresetResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__RemovePreset, "PTZ");
-}
-
-
-
-int PTZBindingService::GotoPreset(_tptz__GotoPreset *tptz__GotoPreset, _tptz__GotoPresetResponse &tptz__GotoPresetResponse)
-{
-    UNUSED(tptz__GotoPresetResponse);
-    DEBUG_MSG("PTZ: %s\n", __FUNCTION__);
-
-
-    std::string preset_cmd;
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    if (tptz__GotoPreset == NULL) {
-        return SOAP_OK;
-    }
-    if (tptz__GotoPreset->ProfileToken.c_str() == NULL) {
-        return SOAP_OK;
-    }
-    if (tptz__GotoPreset->PresetToken.c_str() == NULL) {
-        return SOAP_OK;
-    }
-
-    if (!ctx->get_ptz_node()->get_move_preset().empty()) {
-        preset_cmd = ctx->get_ptz_node()->get_move_preset().c_str();
-    } else {
-        return SOAP_OK;
-    }
-
-    std::string template_str_t("%t");
-
-    auto it_t = preset_cmd.find(template_str_t, 0);
-
-    if( it_t != std::string::npos ) {
-        preset_cmd.replace(it_t, template_str_t.size(), tptz__GotoPreset->PresetToken.c_str());
-    }
-
-    system(preset_cmd.c_str());
-
-    return SOAP_OK;
-}
-
-
-
-int PTZBindingService::GetStatus(_tptz__GetStatus *tptz__GetStatus, _tptz__GetStatusResponse &tptz__GetStatusResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__GetStatus, "PTZ");
-}
-
-
-
-int PTZBindingService::GetConfiguration(_tptz__GetConfiguration *tptz__GetConfiguration, _tptz__GetConfigurationResponse &tptz__GetConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__GetConfiguration, "PTZ");
-}
-
-
-
-int GetPTZNode(struct soap *soap, tt__PTZNode* ptzn)
-{
-    ptzn->token = "PTZNodeToken";
-    ptzn->Name  = soap_new_std__string(soap);
-    *ptzn->Name = "PTZ";
-
-    ptzn->SupportedPTZSpaces = soap_new_tt__PTZSpaces(soap);;
-    soap_default_std__vectorTemplateOfPointerTott__Space2DDescription(soap, &ptzn->SupportedPTZSpaces->tt__PTZSpaces::RelativePanTiltTranslationSpace);
-    soap_default_std__vectorTemplateOfPointerTott__Space1DDescription(soap, &ptzn->SupportedPTZSpaces->tt__PTZSpaces::RelativeZoomTranslationSpace);
-    soap_default_std__vectorTemplateOfPointerTott__Space2DDescription(soap, &ptzn->SupportedPTZSpaces->tt__PTZSpaces::ContinuousPanTiltVelocitySpace);
-    soap_default_std__vectorTemplateOfPointerTott__Space1DDescription(soap, &ptzn->SupportedPTZSpaces->tt__PTZSpaces::ContinuousZoomVelocitySpace);
-    soap_default_std__vectorTemplateOfPointerTott__Space1DDescription(soap, &ptzn->SupportedPTZSpaces->tt__PTZSpaces::PanTiltSpeedSpace);
-    soap_default_std__vectorTemplateOfPointerTott__Space1DDescription(soap, &ptzn->SupportedPTZSpaces->tt__PTZSpaces::ZoomSpeedSpace);
-
-
-    auto ptzs1 = soap_new_tt__Space2DDescription(soap);
-    ptzn->SupportedPTZSpaces->RelativePanTiltTranslationSpace.push_back(ptzs1);
-
-    auto ptzs2 = soap_new_tt__Space1DDescription(soap);
-    ptzn->SupportedPTZSpaces->RelativeZoomTranslationSpace.push_back(ptzs2);
-
-    auto ptzs3 = soap_new_tt__Space2DDescription(soap);
-    ptzn->SupportedPTZSpaces->ContinuousPanTiltVelocitySpace.push_back(ptzs3);
-
-    auto ptzs4 = soap_new_tt__Space1DDescription(soap);
-    ptzn->SupportedPTZSpaces->ContinuousZoomVelocitySpace.push_back(ptzs4);
-
-    auto ptzs5 = soap_new_tt__Space1DDescription(soap);
-    ptzn->SupportedPTZSpaces->PanTiltSpeedSpace.push_back(ptzs5);
-
-    auto ptzs6 = soap_new_tt__Space1DDescription(soap);
-    ptzn->SupportedPTZSpaces->ZoomSpeedSpace.push_back(ptzs6);
-
-    ptzs1->URI         = "http://www.onvif.org/ver10/tptz/PanTiltSpaces/TranslationGenericSpace";
-    ptzs1->XRange      = soap_new_req_tt__FloatRange(soap, -1.0f, 1.0f);
-    ptzs1->YRange      = soap_new_req_tt__FloatRange(soap, -1.0f, 1.0f);
-
-    ptzs2->URI         = "http://www.onvif.org/ver10/tptz/ZoomSpaces/TranslationGenericSpace";
-    ptzs2->XRange      = soap_new_req_tt__FloatRange(soap, -1.0f, 1.0f);
-
-    ptzs3->URI         = "http://www.onvif.org/ver10/tptz/PanTiltSpaces/VelocityGenericSpace";
-    ptzs3->XRange      = soap_new_req_tt__FloatRange(soap, -1.0f, 1.0f);
-    ptzs3->YRange      = soap_new_req_tt__FloatRange(soap, -1.0f, 1.0f);
-
-    ptzs4->URI         = "http://www.onvif.org/ver10/tptz/ZoomSpaces/VelocityGenericSpace";
-    ptzs4->XRange      = soap_new_req_tt__FloatRange(soap, -1.0f, 1.0f);
-
-    ptzs5->URI         = "http://www.onvif.org/ver10/tptz/PanTiltSpaces/GenericSpeedSpace";
-    ptzs5->XRange      = soap_new_req_tt__FloatRange(soap, 0.0f, 1.0f);
-
-    ptzs6->URI         = "http://www.onvif.org/ver10/tptz/ZoomSpaces/ZoomGenericSpeedSpace";
-    ptzs6->XRange      = soap_new_req_tt__FloatRange(soap, 0.0f, 1.0f);
-
-
-    ptzn->MaximumNumberOfPresets = 8;
-    ptzn->HomeSupported          = true;
-    ptzn->FixedHomePosition      = (bool *)soap_malloc(soap, sizeof(bool));
-    soap_s2bool(soap, "true", ptzn->FixedHomePosition);
-
-    return SOAP_OK;
-}
-
-
-
-int PTZBindingService::GetNodes(_tptz__GetNodes *tptz__GetNodes, _tptz__GetNodesResponse &tptz__GetNodesResponse)
-{
-    UNUSED(tptz__GetNodes);
-    DEBUG_MSG("PTZ: %s\n", __FUNCTION__);
-
-
-    soap_default_std__vectorTemplateOfPointerTott__PTZNode(soap, &tptz__GetNodesResponse._tptz__GetNodesResponse::PTZNode);
-    tt__PTZNode* ptzn;
-    ptzn = soap_new_tt__PTZNode(soap);
-    tptz__GetNodesResponse.PTZNode.push_back(ptzn);
-    GetPTZNode(this->soap, ptzn);
-
-    return SOAP_OK;
-}
-
-
-
-int PTZBindingService::GetNode(_tptz__GetNode *tptz__GetNode, _tptz__GetNodeResponse &tptz__GetNodeResponse)
-{
-    UNUSED(tptz__GetNode);
-    DEBUG_MSG("PTZ: %s\n", __FUNCTION__);
-
-    tptz__GetNodeResponse.PTZNode = soap_new_tt__PTZNode(this->soap);
-    GetPTZNode(this->soap, tptz__GetNodeResponse.PTZNode);
-
-    return SOAP_OK;
-}
-
-
-
-int PTZBindingService::SetConfiguration(_tptz__SetConfiguration *tptz__SetConfiguration, _tptz__SetConfigurationResponse &tptz__SetConfigurationResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__SetConfiguration, "PTZ");
-}
-
-
-
-int PTZBindingService::GetConfigurationOptions(_tptz__GetConfigurationOptions *tptz__GetConfigurationOptions, _tptz__GetConfigurationOptionsResponse &tptz__GetConfigurationOptionsResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__GetConfigurationOptions, "PTZ");
-}
-
-
-
-int PTZBindingService::GotoHomePosition(_tptz__GotoHomePosition *tptz__GotoHomePosition, _tptz__GotoHomePositionResponse &tptz__GotoHomePositionResponse)
-{
-    UNUSED(tptz__GotoHomePosition);
-    UNUSED(tptz__GotoHomePositionResponse);
-    DEBUG_MSG("PTZ: %s\n", __FUNCTION__);
-
-    std::string preset_cmd;
-	
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    if (tptz__GotoHomePosition == NULL) {
-        return SOAP_OK;
-    }
-    if (tptz__GotoHomePosition->ProfileToken.c_str() == NULL) {
-        return SOAP_OK;
-    }
-
-    if (!ctx->get_ptz_node()->get_move_preset().empty()) {
-        preset_cmd = ctx->get_ptz_node()->get_move_preset().c_str();
-    } else {
-        return SOAP_OK;
-    }
-
-    std::string template_str_t("%t");
-
-    auto it_t = preset_cmd.find(template_str_t, 0);
-
-    if( it_t != std::string::npos ) {
-        preset_cmd.replace(it_t, template_str_t.size(), "1");
-    }
-
-    system(preset_cmd.c_str());
-
-    return SOAP_OK;
-}
-
-int PTZBindingService::SetHomePosition(_tptz__SetHomePosition *tptz__SetHomePosition, _tptz__SetHomePositionResponse &tptz__SetHomePositionResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__SetHomePosition, "PTZ");
-}
-
-
-
-int PTZBindingService::ContinuousMove(_tptz__ContinuousMove *tptz__ContinuousMove, _tptz__ContinuousMoveResponse &tptz__ContinuousMoveResponse)
-{
-    UNUSED(tptz__ContinuousMoveResponse);
-    DEBUG_MSG("PTZ: %s\n", __FUNCTION__);
-
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    if (tptz__ContinuousMove == NULL) {
-        return SOAP_OK;
-    }
-    if (tptz__ContinuousMove->Velocity == NULL) {
-        return SOAP_OK;
-    }
-    if (tptz__ContinuousMove->Velocity->PanTilt == NULL) {
-        return SOAP_OK;
-    }
-
-    if (tptz__ContinuousMove->Velocity->PanTilt->x > 0) {
-        system(ctx->get_ptz_node()->get_move_right().c_str());
-    } else if (tptz__ContinuousMove->Velocity->PanTilt->x < 0) {
-        system(ctx->get_ptz_node()->get_move_left().c_str());
-    }
-    if (tptz__ContinuousMove->Velocity->PanTilt->y > 0) {
-        system(ctx->get_ptz_node()->get_move_up().c_str());
-    } else if (tptz__ContinuousMove->Velocity->PanTilt->y < 0) {
-        system(ctx->get_ptz_node()->get_move_down().c_str());
-    }
-
-    return SOAP_OK;
-}
-
-
-
-int PTZBindingService::RelativeMove(_tptz__RelativeMove *tptz__RelativeMove, _tptz__RelativeMoveResponse &tptz__RelativeMoveResponse)
-{
-    UNUSED(tptz__RelativeMoveResponse);
-    DEBUG_MSG("PTZ: %s\n", __FUNCTION__);
-
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    if (tptz__RelativeMove == NULL) {
-        return SOAP_OK;
-    }
-    if (tptz__RelativeMove->Translation == NULL) {
-        return SOAP_OK;
-    }
-    if (tptz__RelativeMove->Translation->PanTilt == NULL) {
-        return SOAP_OK;
-    }
-
-    if (tptz__RelativeMove->Translation->PanTilt->x > 0) {
-        system(ctx->get_ptz_node()->get_move_right().c_str());
-        usleep(300000);
-        system(ctx->get_ptz_node()->get_move_stop().c_str());
-    } else if (tptz__RelativeMove->Translation->PanTilt->x < 0) {
-        system(ctx->get_ptz_node()->get_move_left().c_str());
-        usleep(300000);
-        system(ctx->get_ptz_node()->get_move_stop().c_str());
-    }
-    if (tptz__RelativeMove->Translation->PanTilt->y > 0) {
-        system(ctx->get_ptz_node()->get_move_up().c_str());
-        usleep(300000);
-        system(ctx->get_ptz_node()->get_move_stop().c_str());
-    } else if (tptz__RelativeMove->Translation->PanTilt->y < 0) {
-        system(ctx->get_ptz_node()->get_move_down().c_str());
-        usleep(300000);
-        system(ctx->get_ptz_node()->get_move_stop().c_str());
-    }
-
-    return SOAP_OK;
-}
-
-
-
-int PTZBindingService::SendAuxiliaryCommand(_tptz__SendAuxiliaryCommand *tptz__SendAuxiliaryCommand, _tptz__SendAuxiliaryCommandResponse &tptz__SendAuxiliaryCommandResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__SendAuxiliaryCommand, "PTZ");
-}
-
-
-
-int PTZBindingService::AbsoluteMove(_tptz__AbsoluteMove *tptz__AbsoluteMove, _tptz__AbsoluteMoveResponse &tptz__AbsoluteMoveResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__AbsoluteMove, "PTZ");
-}
-
-
-
-int PTZBindingService::Stop(_tptz__Stop *tptz__Stop, _tptz__StopResponse &tptz__StopResponse)
-{
-    UNUSED(tptz__Stop);
-    UNUSED(tptz__StopResponse);
-    DEBUG_MSG("PTZ: %s\n", __FUNCTION__);
-
-    ServiceContext* ctx = (ServiceContext*)this->soap->user;
-
-    system(ctx->get_ptz_node()->get_move_stop().c_str());
-
-    return SOAP_OK;
-}
-
-
-
-int PTZBindingService::GetPresetTours(_tptz__GetPresetTours *tptz__GetPresetTours, _tptz__GetPresetToursResponse &tptz__GetPresetToursResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__GetPresetTours, "PTZ");
-}
-
-
-
-int PTZBindingService::GetPresetTour(_tptz__GetPresetTour *tptz__GetPresetTour, _tptz__GetPresetTourResponse &tptz__GetPresetTourResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__GetPresetTour, "PTZ");
-}
-
-
-
-int PTZBindingService::GetPresetTourOptions(_tptz__GetPresetTourOptions *tptz__GetPresetTourOptions, _tptz__GetPresetTourOptionsResponse &tptz__GetPresetTourOptionsResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__GetPresetTourOptions, "PTZ");
-}
-
-
-
-int PTZBindingService::CreatePresetTour(_tptz__CreatePresetTour *tptz__CreatePresetTour, _tptz__CreatePresetTourResponse &tptz__CreatePresetTourResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__CreatePresetTour, "PTZ");
-}
-
-
-
-int PTZBindingService::ModifyPresetTour(_tptz__ModifyPresetTour *tptz__ModifyPresetTour, _tptz__ModifyPresetTourResponse &tptz__ModifyPresetTourResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__ModifyPresetTour, "PTZ");
-}
-
-
-
-int PTZBindingService::OperatePresetTour(_tptz__OperatePresetTour *tptz__OperatePresetTour, _tptz__OperatePresetTourResponse &tptz__OperatePresetTourResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__OperatePresetTour, "PTZ");
-}
-
-
-
-int PTZBindingService::RemovePresetTour(_tptz__RemovePresetTour *tptz__RemovePresetTour, _tptz__RemovePresetTourResponse &tptz__RemovePresetTourResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__RemovePresetTour, "PTZ");
-}
-
-
-
-int PTZBindingService::GetCompatibleConfigurations(_tptz__GetCompatibleConfigurations *tptz__GetCompatibleConfigurations, _tptz__GetCompatibleConfigurationsResponse &tptz__GetCompatibleConfigurationsResponse)
-{
-    SOAP_EMPTY_HANDLER(tptz__GetCompatibleConfigurations, "PTZ");
-}
diff --git a/src/onvif_srvd/onvif_srvd/src/daemon.c b/src/onvif_srvd/onvif_srvd/src/daemon.c
deleted file mode 100644
index 37d6b01..0000000
--- a/src/onvif_srvd/onvif_srvd/src/daemon.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * daemon.c
- *
- *
- * version 1.1
- *
- *
- *
- * BSD 3-Clause License
- *
- * Copyright (c) 2015, Koynov Stas - skojnov@yandex.ru
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <string.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-
-
-#include "daemon.h"
-
-
-
-
-
-/*
- *  How can I execute a new process from GNOME Terminal
- *  so that the child process's parent PID becomes 1 and not
- *  the PID of the ubuntu session init process?
- *
- *  This is intentionally hard.
- *  Service managers want to keep track of orphaned child processes.
- *  They want not to lose them to process #1.
- *  Stop trying to do that!!!
- *
- *
- *  If you are asking solely because you think that your process (daemon)
- *  ought to have a parent process ID of 1, then wean yourself off this idea.
- *
- *
- *  Therefore, modern Linux system does not correctly determine the fact of
- *  daemonized through the function:
- *
- *  if( getppid() == 1 )
- *      return 1;        //already a daemon
- *
- *  We uses our flag daemonized in daemon_info_t
- */
-
-
-
-volatile struct daemon_info_t daemon_info =
-{
-    .terminated = 0,
-    .daemonized = 0,                   //flag will be set in finale function daemonize()
-
-
-    #ifdef  DAEMON_NO_CHDIR
-        .no_chdir = DAEMON_NO_CHDIR,
-    #else
-        .no_chdir = 0,
-    #endif
-
-
-    #ifdef  DAEMON_NO_FORK
-        .no_fork = DAEMON_NO_FORK,
-    #else
-        .no_fork = 0,
-    #endif
-
-
-    #ifdef  DAEMON_NO_CLOSE_STDIO
-        .no_close_stdio = DAEMON_NO_CLOSE_STDIO,
-    #else
-        .no_close_stdio = 0,
-    #endif
-
-
-    #ifdef  DAEMON_PID_FILE_NAME
-        .pid_file = DAEMON_PID_FILE_NAME,
-    #else
-        .pid_file = NULL,
-    #endif
-
-
-    #ifdef  DAEMON_LOG_FILE_NAME
-        .log_file = DAEMON_LOG_FILE_NAME,
-    #else
-        .log_file = NULL,
-    #endif
-
-
-    #ifdef  DAEMON_CMD_PIPE_NAME
-        .cmd_pipe = DAEMON_CMD_PIPE_NAME,
-    #else
-        .cmd_pipe = NULL,
-    #endif
-};
-
-
-
-
-
-void exit_if_not_daemonized(int exit_status)
-{
-    if( !daemon_info.daemonized )
-        _exit(exit_status);
-}
-
-
-
-void daemon_error_exit(const char *format, ...)
-{
-    va_list ap;
-
-
-    if( format &&  *format )
-    {
-        va_start(ap, format);
-        fprintf(stderr, "%s: ", DAEMON_NAME);
-        vfprintf(stderr, format, ap);
-        va_end(ap);
-    }
-
-
-    _exit(EXIT_FAILURE);
-}
-
-
-
-int redirect_stdio_to_devnull(void)
-{
-    int fd;
-
-
-    fd = open("/dev/null", O_RDWR);
-    if(fd == -1)
-        return -1; //error can't open file
-
-
-    dup2(fd, STDIN_FILENO);
-    dup2(fd, STDOUT_FILENO);
-    dup2(fd, STDERR_FILENO);
-
-
-    if(fd > 2)
-        close(fd);
-
-
-    return 0; //good job
-}
-
-
-
-int create_pid_file(const char *pid_file_name)
-{
-    int fd;
-    const int BUF_SIZE = 32;
-    char buf[BUF_SIZE];
-
-
-
-    if( !pid_file_name )
-    {
-        errno = EINVAL;
-        return -1;
-    }
-
-
-    fd = open(pid_file_name, O_RDWR | O_CREAT, 0644);
-    if(fd == -1)
-        return -1; // Could not create on PID file
-
-
-    if( lockf(fd, F_TLOCK, 0) == -1 )
-    {
-        close(fd);
-        return -1; // Could not get lock on PID file
-    }
-
-
-    if( ftruncate(fd, 0) != 0 )
-    {
-        close(fd);
-        return -1; // Could not truncate on PID file
-    }
-
-
-    snprintf(buf, BUF_SIZE, "%ld\n", (long)getpid());
-    if( write(fd, buf, strlen(buf)) != (int)strlen(buf) )
-    {
-        close(fd);
-        return -1; // Could not write PID to PID file
-    }
-
-
-    return fd; //good job
-}
-
-
-
-static void do_fork()
-{
-    switch( fork() )                                     // Become background process
-    {
-        case -1:  daemon_error_exit("Can't fork: %m\n");
-        case  0:  break;                                 // child process (go next)
-        default:  _exit(EXIT_SUCCESS);                   // We can exit the parent process
-    }
-
-    // ---- At this point we are executing as the child process ----
-}
-
-
-
-void daemonize2(void (*optional_init)(void *), void *data)
-{
-    if( !daemon_info.no_fork )
-        do_fork();
-
-
-    // Reset the file mode mask
-    umask(0);
-
-
-    // Create a new process group(session) (SID) for the child process
-    // call setsid() only if fork is done
-    if( !daemon_info.no_fork && (setsid() == -1) )
-        daemon_error_exit("Can't setsid: %m\n");
-
-
-    // Change the current working directory to "/"
-    // This prevents the current directory from locked
-    // The demon must always change the directory to "/"
-    if( !daemon_info.no_chdir && (chdir("/") != 0) )
-        daemon_error_exit("Can't chdir: %m\n");
-
-
-    if( daemon_info.pid_file && (create_pid_file(daemon_info.pid_file) == -1) )
-        daemon_error_exit("Can't create pid file: %s: %m\n", daemon_info.pid_file);
-
-
-    // call user functions for the optional initialization
-    // before closing the standardIO (STDIN, STDOUT, STDERR)
-    if( optional_init )
-        optional_init(data);
-
-
-    if( !daemon_info.no_close_stdio && (redirect_stdio_to_devnull() != 0) )
-        daemon_error_exit("Can't redirect stdio to /dev/null: %m\n");
-
-
-    daemon_info.daemonized = 1; //good job
-}
diff --git a/src/onvif_srvd/onvif_srvd/src/daemon.h b/src/onvif_srvd/onvif_srvd/src/daemon.h
deleted file mode 100644
index 6ae678c..0000000
--- a/src/onvif_srvd/onvif_srvd/src/daemon.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * daemon.h
- *
- *
- * version 1.1
- *
- *
- *
- * BSD 3-Clause License
- *
- * Copyright (c) 2015, Koynov Stas - skojnov@yandex.ru
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef DAEMON_HEADER
-#define DAEMON_HEADER
-
-
-#include <stddef.h>  //for NULL
-
-
-
-
-
-#define DAEMON_DEF_TO_STR_(text) #text
-#define DAEMON_DEF_TO_STR(arg) DAEMON_DEF_TO_STR_(arg)
-
-
-#define DAEMON_MAJOR_VERSION_STR  DAEMON_DEF_TO_STR(DAEMON_MAJOR_VERSION)
-#define DAEMON_MINOR_VERSION_STR  DAEMON_DEF_TO_STR(DAEMON_MINOR_VERSION)
-#define DAEMON_PATCH_VERSION_STR  DAEMON_DEF_TO_STR(DAEMON_PATCH_VERSION)
-
-#define DAEMON_VERSION_STR  DAEMON_MAJOR_VERSION_STR "." \
-                            DAEMON_MINOR_VERSION_STR "." \
-                            DAEMON_PATCH_VERSION_STR
-
-
-
-
-
-struct daemon_info_t
-{
-    //flags
-    unsigned int terminated     :1;
-    unsigned int daemonized     :1;
-    unsigned int no_chdir       :1;
-    unsigned int no_fork        :1;
-    unsigned int no_close_stdio :1;
-
-    const char *pid_file;
-    const char *log_file;
-    const char *cmd_pipe;
-};
-
-
-extern volatile struct daemon_info_t daemon_info;
-
-
-
-
-
-int redirect_stdio_to_devnull(void);
-int create_pid_file(const char *pid_file_name);
-
-
-
-void daemon_error_exit(const char *format, ...);
-void exit_if_not_daemonized(int exit_status);
-
-
-
-void daemonize2(void (*optional_init)(void *), void *data);
-
-static inline void daemonize() { daemonize2(NULL, NULL); }
-
-
-
-
-
-#endif //DAEMON_HEADER
diff --git a/src/onvif_srvd/onvif_srvd/src/eth_dev_param.cpp b/src/onvif_srvd/onvif_srvd/src/eth_dev_param.cpp
deleted file mode 100644
index a0957ea..0000000
--- a/src/onvif_srvd/onvif_srvd/src/eth_dev_param.cpp
+++ /dev/null
@@ -1,519 +0,0 @@
-/*
- * eth_dev_param.cpp
- *
- *
- * version 1.0
- *
- *
- * Copyright (c) 2015, Koynov Stas - skojnov@yandex.ru
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <arpa/inet.h>
-#include <net/if_arp.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-
-#include "eth_dev_param.h"
-
-
-
-
-
-Eth_Dev_Param::Eth_Dev_Param() :
-
-    //private
-    _sd(-1),
-    _opened(false)
-{
-}
-
-
-
-Eth_Dev_Param::~Eth_Dev_Param()
-{
-//    if( is_open() )
-//        this->close(); //close old socket
-}
-
-
-
-int Eth_Dev_Param::open(const char *dev_name)
-{
-
-    this->close(); //close old socket
-
-
-    if( !dev_name || (strlen(dev_name) >= IFNAMSIZ) )
-        return -1;
-
-
-    _sd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
-
-    if( _sd == -1 )
-        return -1;
-
-
-    strcpy(_ifr.ifr_name, dev_name);
-
-
-    // try get flags for interface
-    if( ioctl(_sd, SIOCGIFFLAGS, &_ifr) == -1 )
-    {
-       this->close();
-       return -1;     //can't get flags
-    }
-
-
-    _opened = true;
-    return 0; //good job
-}
-
-
-
-void Eth_Dev_Param::close()
-{
-    if( _sd != -1 )
-        ::close(_sd);
-
-    memset(&_ifr, 0, sizeof(struct ifreq));
-    _opened = false;
-    _sd     = -1;
-}
-
-
-
-int Eth_Dev_Param::set_ip(const char *IP)
-{
-    if( !is_open() || !IP )
-        return -1;
-
-
-    struct sockaddr_in* addr = (struct sockaddr_in*)&_ifr.ifr_addr;
-
-    memset(addr, 0, sizeof( struct sockaddr_in) );
-    addr->sin_family  = AF_INET;
-
-    if( inet_pton(AF_INET, IP, &addr->sin_addr) <= 0 )
-        return -1;
-
-
-    return ioctl(_sd, SIOCSIFADDR, &_ifr);
-}
-
-
-
-int Eth_Dev_Param::set_ip(uint32_t IP)
-{
-    if( !is_open() )
-        return -1;
-
-
-    struct sockaddr_in* addr = (struct sockaddr_in*)&_ifr.ifr_addr;
-
-    memset(addr, 0, sizeof( struct sockaddr_in) );
-    addr->sin_family      = AF_INET;
-    addr->sin_addr.s_addr = IP;
-
-
-    return ioctl(_sd, SIOCSIFADDR, &_ifr);
-}
-
-
-
-int Eth_Dev_Param::get_ip(char *IP) const
-{
-    if( !is_open() || !IP )
-        return -1;
-
-
-    if( ioctl(_sd, SIOCGIFADDR, &_ifr) != 0 )
-        return -1;
-
-    struct sockaddr_in* addr = (struct sockaddr_in*)&_ifr.ifr_addr;
-
-
-    if( inet_ntop(AF_INET, &addr->sin_addr, IP, INET_ADDRSTRLEN) != NULL )
-        return 0; //good job
-
-
-    return -1;
-}
-
-
-
-int Eth_Dev_Param::get_ip(uint32_t *IP) const
-{
-    if( !is_open() || !IP )
-        return -1;
-
-
-    if( ioctl(_sd, SIOCGIFDSTADDR, &_ifr) != 0 )
-        return -1;
-
-    struct sockaddr_in* addr = (struct sockaddr_in*)&_ifr.ifr_addr;
-
-    *IP = addr->sin_addr.s_addr;
-
-
-    return 0; //good job
-}
-
-
-
-int Eth_Dev_Param::set_mask(const char *mask)
-{
-    if( !is_open() || !mask )
-        return -1;
-
-
-    struct sockaddr_in* addr = (struct sockaddr_in*)&_ifr.ifr_addr;
-
-    memset(addr, 0, sizeof( struct sockaddr_in) );
-    addr->sin_family  = AF_INET;
-
-    if( inet_pton(AF_INET, mask, &addr->sin_addr) <= 0 )
-        return -1;
-
-
-    return ioctl(_sd, SIOCSIFNETMASK, &_ifr);
-}
-
-
-
-int Eth_Dev_Param::set_mask(uint32_t mask)
-{
-    if( !is_open() )
-        return -1;
-
-
-    struct sockaddr_in* addr = (struct sockaddr_in*)&_ifr.ifr_addr;
-
-    memset(addr, 0, sizeof( struct sockaddr_in) );
-    addr->sin_family      = AF_INET;
-    addr->sin_addr.s_addr = mask;
-
-
-    return ioctl(_sd, SIOCSIFNETMASK, &_ifr);
-}
-
-
-
-int Eth_Dev_Param::get_mask(char *mask) const
-{
-    if( !is_open() || !mask )
-        return -1;
-
-
-    if( ioctl(_sd, SIOCGIFNETMASK, &_ifr) != 0 )
-        return -1;
-
-    struct sockaddr_in* addr = (struct sockaddr_in*)&_ifr.ifr_addr;
-
-
-    if( inet_ntop(AF_INET, &addr->sin_addr, mask, INET_ADDRSTRLEN) != NULL )
-        return 0; //good job
-
-
-    return -1;
-}
-
-
-
-int Eth_Dev_Param::get_mask(uint32_t *mask) const
-{
-    if( !is_open() || !mask )
-        return -1;
-
-
-    if( ioctl(_sd, SIOCGIFNETMASK, &_ifr) != 0 )
-        return -1;
-
-    struct sockaddr_in* addr = (struct sockaddr_in*)&_ifr.ifr_addr;
-
-    *mask = addr->sin_addr.s_addr;
-
-
-    return 0; //good job
-}
-
-
-
-int Eth_Dev_Param::get_mask_prefix() const
-{
-    int prefix = 0;
-    uint32_t mask;
-    get_mask(&mask);
-
-    mask = ntohl(mask);
-
-    while(mask != 0)
-    {
-        mask <<= 1;
-        prefix++;
-    }
-
-    return prefix;
-}
-
-
-
-int Eth_Dev_Param::set_gateway(const char *gateway)
-{
-    if( !is_open() || !gateway )
-        return -1;
-
-    char cmd[64];
-
-
-    sprintf(cmd, "route add %s %s", gateway, _ifr.ifr_name);
-
-    return run_shell_cmd(cmd);
-}
-
-
-
-int Eth_Dev_Param::set_gateway(uint32_t gateway)
-{
-    if( !is_open() )
-        return -1;
-
-    char cmd[64];
-
-    struct in_addr in;
-    in.s_addr = gateway;
-
-
-    sprintf(cmd, "route add %s %s", inet_ntoa(in), _ifr.ifr_name);
-
-    return run_shell_cmd(cmd);
-}
-
-
-
-int Eth_Dev_Param::get_gateway(char *gateway) const
-{
-    if( !is_open() || !gateway )
-        return -1;
-
-    uint32_t tmp_gateway;
-
-    struct sockaddr_in s_addr;
-
-    if( get_gateway(&tmp_gateway) != 0 )
-        return -1;
-
-    memset(&s_addr, 0, sizeof(struct sockaddr_in));
-    s_addr.sin_family      = AF_INET;
-    s_addr.sin_addr.s_addr = tmp_gateway;
-
-
-    if( inet_ntop(AF_INET, &s_addr.sin_addr, gateway, INET_ADDRSTRLEN) != NULL )
-        return 0; //good job
-    else
-        return -1;
-}
-
-
-
-int Eth_Dev_Param::get_gateway(uint32_t *gateway) const
-{
-    if( !is_open() || !gateway )
-        return -1;
-
-
-    char devname[64];
-    unsigned long d, g, m;
-    int flgs, ref, use, metric, mtu, win, ir;
-
-
-    FILE *fp = fopen("/proc/net/route", "r");
-
-    if( !fp )
-        return -1; //can't open file
-
-
-    if( fscanf(fp, "%*[^\n]\n") < 0 ) // Skip the first line
-    {
-        fclose(fp);
-        return -1;   // Empty or missing line, or read error
-    }
-
-
-    while( !feof(fp) )
-    {
-        int r;
-        r = fscanf(fp, "%63s%lx%lx%X%d%d%d%lx%d%d%d\n",
-                   devname, &d, &g, &flgs, &ref, &use, &metric, &m, &mtu, &win, &ir);
-
-
-        if (r != 11)
-        {
-            fclose(fp);
-            return -1;
-        }
-
-        if( strcmp(devname, _ifr.ifr_name) != 0 )
-            continue;
-
-        fclose(fp);
-        *gateway = g;
-
-        return 0; //good job
-    }
-
-
-    fclose(fp);
-    return -1; //can't finde
-}
-
-
-
-int Eth_Dev_Param::set_hwaddr(const char *hwaddr)
-{
-
-    if( !is_open() || !hwaddr || (strlen(hwaddr) != 17) )
-        return -1;
-
-
-    int tmp_mac[6]; // int for sscanf!!!
-
-
-    sscanf(hwaddr, "%x:%x:%x:%x:%x:%x", &tmp_mac[0], &tmp_mac[1], &tmp_mac[2], &tmp_mac[3], &tmp_mac[4], &tmp_mac[5]);
-
-
-    _ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
-
-    for(int i = 0; i < 6; i++)
-        _ifr.ifr_hwaddr.sa_data[i] = tmp_mac[i];
-
-
-    return ioctl(_sd, SIOCSIFHWADDR, &_ifr);
-}
-
-
-
-int Eth_Dev_Param::set_hwaddr(const uint8_t *hwaddr)
-{
-    if( !is_open() || !hwaddr )
-        return -1;
-
-
-    _ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
-    memcpy(_ifr.ifr_hwaddr.sa_data, hwaddr, 6);
-
-
-    char cmd[32];
-
-    sprintf(cmd, "ifconfig %s down", dev_name());
-    run_shell_cmd(cmd);
-
-    int ret = ioctl(_sd, SIOCSIFHWADDR, &_ifr);
-
-    sprintf(cmd, "ifconfig %s up", dev_name());
-    run_shell_cmd(cmd);
-
-
-    return ret;
-}
-
-
-
-int Eth_Dev_Param::get_hwaddr(char *hwaddr) const
-{
-    if( !is_open() || !hwaddr )
-        return -1;
-
-
-    if( ioctl(_sd, SIOCGIFHWADDR, &_ifr) != 0 )
-        return -1;
-
-
-    if( _ifr.ifr_hwaddr.sa_family != ARPHRD_ETHER )
-        return -1;
-
-
-    uint8_t *tmp_mac = (uint8_t *)_ifr.ifr_hwaddr.sa_data;
-
-
-    sprintf(hwaddr, "%02x:%02x:%02x:%02x:%02x:%02x",
-            tmp_mac[0], tmp_mac[1], tmp_mac[2], tmp_mac[3], tmp_mac[4], tmp_mac[5]);
-
-
-    return 0; //good job
-}
-
-
-
-int Eth_Dev_Param::get_hwaddr(uint8_t *hwaddr) const
-{
-    if( !is_open() || !hwaddr )
-        return -1;
-
-
-    if( ioctl(_sd, SIOCGIFHWADDR, &_ifr) != 0 )
-        return -1;
-
-
-    if( _ifr.ifr_hwaddr.sa_family != ARPHRD_ETHER )
-        return -1;
-
-
-    memcpy(hwaddr, _ifr.ifr_hwaddr.sa_data, 6);
-
-
-    return 0; //good job
-}
-
-
-
-int Eth_Dev_Param::run_shell_cmd(const char *cmd) const
-{
-    FILE *ptr;
-
-    if(!cmd)
-        return -1;
-
-
-    ptr = popen(cmd, "w");
-    if(!ptr)
-        return -1;
-
-
-    if(pclose(ptr)<0)
-        return -1;
-
-
-    return 0;  //good job
-}
diff --git a/src/onvif_srvd/onvif_srvd/src/eth_dev_param.h b/src/onvif_srvd/onvif_srvd/src/eth_dev_param.h
deleted file mode 100644
index d14c9d5..0000000
--- a/src/onvif_srvd/onvif_srvd/src/eth_dev_param.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * eth_dev_param.h
- *
- *
- * version 1.0
- *
- *
- * Copyright (c) 2015, Koynov Stas - skojnov@yandex.ru
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef ETH_DEV_PARAM_H
-#define ETH_DEV_PARAM_H
-
-#include <stdint.h>
-#include <net/if.h>
-
-
-
-
-
-class Eth_Dev_Param
-{
-    public:
-         Eth_Dev_Param();
-        ~Eth_Dev_Param();
-
-        bool is_open() const { return _opened; }
-
-        int open(const char *dev_name);
-        void close();
-
-        const char *dev_name() const { return _ifr.ifr_name; }
-
-
-        int set_ip(const char *IP);
-        int set_ip(uint32_t IP);
-
-        int get_ip(char *IP) const;
-        int get_ip(uint32_t *IP) const;
-
-
-        int set_mask(const char *mask);
-        int set_mask(uint32_t mask);
-
-        int get_mask(char *mask) const;
-        int get_mask(uint32_t *mask) const;
-        int get_mask_prefix() const;
-
-
-        int set_gateway(const char *gateway);
-        int set_gateway(uint32_t gateway);
-
-        int get_gateway(char *gateway) const;
-        int get_gateway(uint32_t *gateway) const;
-
-
-        int set_hwaddr(const char *hwaddr);
-        int set_hwaddr(const uint8_t *hwaddr);
-
-        int get_hwaddr(char *hwaddr) const;
-        int get_hwaddr(uint8_t *hwaddr) const;
-
-
-    private:
-        int          _sd;
-        bool         _opened;
-        struct ifreq _ifr;
-
-        int run_shell_cmd(const char *cmd) const;
-};
-
-
-
-
-
-#endif // ETH_DEV_PARAM_H
diff --git a/src/onvif_srvd/onvif_srvd/src/onvif_srvd.cpp b/src/onvif_srvd/onvif_srvd/src/onvif_srvd.cpp
deleted file mode 100644
index 716071d..0000000
--- a/src/onvif_srvd/onvif_srvd/src/onvif_srvd.cpp
+++ /dev/null
@@ -1,539 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <getopt.h>
-
-
-#include "daemon.h"
-#include "smacros.h"
-#include "ServiceContext.h"
-
-// ---- gsoap ----
-#include "DeviceBinding.nsmap"
-#include "soapDeviceBindingService.h"
-#include "soapMediaBindingService.h"
-#include "soapPTZBindingService.h"
-
-
-
-
-
-static const char *help_str =
-        " ===============  Help  ===============\n"
-        " Daemon name:  " DAEMON_NAME          "\n"
-        " Daemon  ver:  " DAEMON_VERSION_STR   "\n"
-#ifdef  DEBUG
-        " Build  mode:  debug\n"
-#else
-        " Build  mode:  release\n"
-#endif
-        " Build  date:  " __DATE__ "\n"
-        " Build  time:  " __TIME__ "\n\n"
-        "Options:                      description:\n\n"
-        "       --no_chdir             Don't change the directory to '/'\n"
-        "       --no_fork              Don't do fork\n"
-        "       --no_close             Don't close standart IO files\n"
-        "       --pid_file     [value] Set pid file name\n"
-        "       --log_file     [value] Set log file name\n\n"
-        "       --port         [value] Set socket port for Services   (default = 1000)\n"
-        "       --user         [value] Set user name for Services     (default = admin)\n"
-        "       --password     [value] Set user password for Services (default = admin)\n"
-        "       --model        [value] Set model device for Services  (default = Model)\n"
-        "       --scope        [value] Set scope for Services         (default don't set)\n"
-        "       --ifs          [value] Set Net interfaces for work    (default don't set)\n"
-        "       --hardware_id  [value] Set Hardware ID of device      (default = HardwareID)\n"
-        "       --serial_num   [value] Set Serial number of device    (default = SerialNumber)\n"
-        "       --firmware_ver [value] Set firmware version of device (default = FirmwareVersion)\n"
-        "       --manufacturer [value] Set manufacturer for Services  (default = Manufacturer)\n\n"
-        "       --name         [value] Set Name for Profile Media Services\n"
-        "       --width        [value] Set Width for Profile Media Services\n"
-        "       --height       [value] Set Height for Profile Media Services\n"
-        "       --url          [value] Set URL (or template URL) for Profile Media Services\n"
-        "       --snapurl      [value] Set URL (or template URL) for Snapshot\n"
-        "                              in template mode %s will be changed to IP of interface (see opt ifs)\n"
-        "       --type         [value] Set Type for Profile Media Services (JPEG|MPEG4|H264)\n"
-        "                              It is also a sign of the end of the profile parameters\n\n"
-        "       --ptz                  Enable PTZ support\n"
-        "       --move_left    [value] Set process to call for PTZ pan left movement\n"
-        "       --move_right   [value] Set process to call for PTZ pan right movement\n"
-        "       --move_up      [value] Set process to call for PTZ tilt up movement\n"
-        "       --move_down    [value] Set process to call for PTZ tilt down movement\n"
-        "       --move_stop    [value] Set process to call for PTZ stop movement\n"
-        "       --move_preset  [value] Set process to call for PTZ goto preset movement\n"
-        "  -v,  --version              Display daemon version\n"
-        "  -h,  --help                 Display this help\n\n";
-
-
-
-
-// indexes for long_opt function
-namespace LongOpts
-{
-    enum
-    {
-        version = 'v',
-        help    = 'h',
-
-        //daemon options
-        no_chdir = 1,
-        no_fork,
-        no_close,
-        pid_file,
-        log_file,
-
-        //ONVIF Service options (context)
-        port,
-        user,
-        password,
-        manufacturer,
-        model,
-        firmware_ver,
-        serial_num,
-        hardware_id,
-        scope,
-        ifs,
-
-        //Media Profile for ONVIF Media Service
-        name,
-        width,
-        height,
-        url,
-        snapurl,
-        type,
-
-        //PTZ Profile for ONVIF PTZ Service
-        ptz,
-        move_left,
-        move_right,
-        move_up,
-        move_down,
-        move_stop,
-        move_preset
-    };
-}
-
-
-
-static const char *short_opts = "hv";
-
-
-static const struct option long_opts[] =
-{
-    { "version",      no_argument,       NULL, LongOpts::version       },
-    { "help",         no_argument,       NULL, LongOpts::help          },
-
-    //daemon options
-    { "no_chdir",     no_argument,       NULL, LongOpts::no_chdir      },
-    { "no_fork",      no_argument,       NULL, LongOpts::no_fork       },
-    { "no_close",     no_argument,       NULL, LongOpts::no_close      },
-    { "pid_file",     required_argument, NULL, LongOpts::pid_file      },
-    { "log_file",     required_argument, NULL, LongOpts::log_file      },
-
-    //ONVIF Service options (context)
-    { "port",         required_argument, NULL, LongOpts::port          },
-    { "user",         required_argument, NULL, LongOpts::user          },
-    { "password",     required_argument, NULL, LongOpts::password      },
-    { "manufacturer", required_argument, NULL, LongOpts::manufacturer  },
-    { "model",        required_argument, NULL, LongOpts::model         },
-    { "firmware_ver", required_argument, NULL, LongOpts::firmware_ver  },
-    { "serial_num",   required_argument, NULL, LongOpts::serial_num    },
-    { "hardware_id",  required_argument, NULL, LongOpts::hardware_id   },
-    { "scope",        required_argument, NULL, LongOpts::scope         },
-    { "ifs",          required_argument, NULL, LongOpts::ifs           },
-
-    //Media Profile for ONVIF Media Service
-    { "name",          required_argument, NULL, LongOpts::name         },
-    { "width",         required_argument, NULL, LongOpts::width        },
-    { "height",        required_argument, NULL, LongOpts::height       },
-    { "url",           required_argument, NULL, LongOpts::url          },
-    { "snapurl",       required_argument, NULL, LongOpts::snapurl      },
-    { "type",          required_argument, NULL, LongOpts::type         },
-
-    //PTZ Profile for ONVIF PTZ Service
-    { "ptz",           no_argument,       NULL, LongOpts::ptz          },
-    { "move_left",     required_argument, NULL, LongOpts::move_left    },
-    { "move_right",    required_argument, NULL, LongOpts::move_right   },
-    { "move_up",       required_argument, NULL, LongOpts::move_up      },
-    { "move_down",     required_argument, NULL, LongOpts::move_down    },
-    { "move_stop",     required_argument, NULL, LongOpts::move_stop    },
-    { "move_preset",   required_argument, NULL, LongOpts::move_preset  },
-
-    { NULL,           no_argument,       NULL,  0                      }
-};
-
-
-
-
-
-#define FOREACH_SERVICE(APPLY, soap)                    \
-        APPLY(DeviceBindingService, soap)               \
-        APPLY(MediaBindingService, soap)                \
-        APPLY(PTZBindingService, soap)                  \
-
-
-/*
- * If you need support for other services,
- * add the desired option to the macro FOREACH_SERVICE.
- *
- * Note: Do not forget to add the gsoap binding class for the service,
- * and the implementation methods for it, like for DeviceBindingService
-
-
-
-        APPLY(ImagingBindingService, soap)               \
-        APPLY(PTZBindingService, soap)                   \
-        APPLY(RecordingBindingService, soap)             \
-        APPLY(ReplayBindingService, soap)                \
-        APPLY(SearchBindingService, soap)                \
-        APPLY(ReceiverBindingService, soap)              \
-        APPLY(DisplayBindingService, soap)               \
-        APPLY(EventBindingService, soap)                 \
-        APPLY(PullPointSubscriptionBindingService, soap) \
-        APPLY(NotificationProducerBindingService, soap)  \
-        APPLY(SubscriptionManagerBindingService, soap)   \
-*/
-
-
-#define DECLARE_SERVICE(service, soap) service service ## _inst(soap);
-
-#define DISPATCH_SERVICE(service, soap)                                  \
-                else if (service ## _inst.dispatch() != SOAP_NO_METHOD) {\
-                    soap_send_fault(soap);                               \
-                    soap_stream_fault(soap, std::cerr);                  \
-                }
-
-
-
-
-static struct soap *soap;
-
-ServiceContext service_ctx;
-
-
-
-
-
-void daemon_exit_handler(int sig)
-{
-    //Here we release resources
-
-    UNUSED(sig);
-    soap_destroy(soap); // delete managed C++ objects
-    soap_end(soap);     // delete managed memory
-    soap_free(soap);    // free the context
-
-
-    unlink(daemon_info.pid_file);
-
-
-    exit(EXIT_SUCCESS); // good job (we interrupted (finished) main loop)
-}
-
-
-
-void init_signals(void)
-{
-    struct sigaction sa;
-
-    memset(&sa, 0, sizeof(sa));
-    sa.sa_handler = daemon_exit_handler;
-    if( sigaction(SIGTERM, &sa, NULL) != 0 )
-        daemon_error_exit("Can't set daemon_exit_handler: %m\n");
-
-
-    signal(SIGCHLD, SIG_IGN); // ignore child
-    signal(SIGTSTP, SIG_IGN); // ignore tty signals
-    signal(SIGTTOU, SIG_IGN);
-    signal(SIGTTIN, SIG_IGN);
-    signal(SIGHUP,  SIG_IGN);
-}
-
-
-
-void processing_cmd(int argc, char *argv[])
-{
-    int opt;
-
-    StreamProfile  profile;
-
-
-    while( (opt = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1 )
-    {
-        switch( opt )
-        {
-
-            case LongOpts::help:
-                        puts(help_str);
-                        exit_if_not_daemonized(EXIT_SUCCESS);
-                        break;
-
-            case LongOpts::version:
-                        puts(DAEMON_NAME "  version  " DAEMON_VERSION_STR "\n");
-                        exit_if_not_daemonized(EXIT_SUCCESS);
-                        break;
-
-
-                 //daemon options
-            case LongOpts::no_chdir:
-                        daemon_info.no_chdir = 1;
-                        break;
-
-            case LongOpts::no_fork:
-                        daemon_info.no_fork = 1;
-                        break;
-
-            case LongOpts::no_close:
-                        daemon_info.no_close_stdio = 1;
-                        break;
-
-            case LongOpts::pid_file:
-                        daemon_info.pid_file = optarg;
-                        break;
-
-            case LongOpts::log_file:
-                        daemon_info.log_file = optarg;
-                        break;
-
-
-            //ONVIF Service options (context)
-            case LongOpts::port:
-                        service_ctx.port = atoi(optarg);
-                        break;
-
-            case LongOpts::user:
-                        service_ctx.user = optarg;
-                        break;
-
-            case LongOpts::password:
-                        service_ctx.password = optarg;
-                        break;
-
-            case LongOpts::manufacturer:
-                        service_ctx.manufacturer = optarg;
-                        break;
-
-            case LongOpts::model:
-                        service_ctx.model = optarg;
-                        break;
-
-            case LongOpts::firmware_ver:
-                        service_ctx.firmware_version = optarg;
-                        break;
-
-            case LongOpts::serial_num:
-                        service_ctx.serial_number = optarg;
-                        break;
-
-            case LongOpts::hardware_id:
-                        service_ctx.hardware_id = optarg;
-                        break;
-
-            case LongOpts::scope:
-                        service_ctx.scopes.push_back(optarg);
-                        break;
-
-            case LongOpts::ifs:
-                        service_ctx.eth_ifs.push_back(Eth_Dev_Param());
-
-                        if( service_ctx.eth_ifs.back().open(optarg) != 0 )
-                            daemon_error_exit("Can't open ethernet interface: %s - %m\n", optarg);
-
-                        break;
-
-
-            //Media Profile for ONVIF Media Service
-            case LongOpts::name:
-                        if( !profile.set_name(optarg) )
-                            daemon_error_exit("Can't set name for Profile: %s\n", profile.get_cstr_err());
-
-                        break;
-
-
-            case LongOpts::width:
-                        if( !profile.set_width(optarg) )
-                            daemon_error_exit("Can't set width for Profile: %s\n", profile.get_cstr_err());
-
-                        break;
-
-
-            case LongOpts::height:
-                        if( !profile.set_height(optarg) )
-                            daemon_error_exit("Can't set height for Profile: %s\n", profile.get_cstr_err());
-
-                        break;
-
-
-            case LongOpts::url:
-                        if( !profile.set_url(optarg) )
-                            daemon_error_exit("Can't set URL for Profile: %s\n", profile.get_cstr_err());
-
-                        break;
-
-
-            case LongOpts::snapurl:
-                        if( !profile.set_snapurl(optarg) )
-                            daemon_error_exit("Can't set URL for Snapshot: %s\n", profile.get_cstr_err());
-
-                        break;
-
-
-            case LongOpts::type:
-                        if( !profile.set_type(optarg) )
-                            daemon_error_exit("Can't set type for Profile: %s\n", profile.get_cstr_err());
-
-                        if( !service_ctx.add_profile(profile) )
-                            daemon_error_exit("Can't add Profile: %s\n", service_ctx.get_cstr_err());
-
-                        profile.clear(); //now we can add new profile (just uses one variable)
-
-                        break;
-
-
-            //PTZ Profile for ONVIF PTZ Service
-            case LongOpts::ptz:
-                        service_ctx.get_ptz_node()->enable = true;
-                        break;
-
-
-            case LongOpts::move_left:
-                        if( !service_ctx.get_ptz_node()->set_move_left(optarg) )
-                            daemon_error_exit("Can't set process for pan left movement: %s\n", service_ctx.get_ptz_node()->get_cstr_err());
-
-                        break;
-
-
-            case LongOpts::move_right:
-                        if( !service_ctx.get_ptz_node()->set_move_right(optarg) )
-                            daemon_error_exit("Can't set process for pan right movement: %s\n", service_ctx.get_ptz_node()->get_cstr_err());
-
-                        break;
-
-
-            case LongOpts::move_up:
-                        if( !service_ctx.get_ptz_node()->set_move_up(optarg) )
-                            daemon_error_exit("Can't set process for tilt up movement: %s\n", service_ctx.get_ptz_node()->get_cstr_err());
-
-                        break;
-
-
-            case LongOpts::move_down:
-                        if( !service_ctx.get_ptz_node()->set_move_down(optarg) )
-                            daemon_error_exit("Can't set process for tilt down movement: %s\n", service_ctx.get_ptz_node()->get_cstr_err());
-
-                        break;
-
-
-            case LongOpts::move_stop:
-                        if( !service_ctx.get_ptz_node()->set_move_stop(optarg) )
-                            daemon_error_exit("Can't set process for stop movement: %s\n", service_ctx.get_ptz_node()->get_cstr_err());
-
-                        break;
-
-
-            case LongOpts::move_preset:
-                        if( !service_ctx.get_ptz_node()->set_move_preset(optarg) )
-                            daemon_error_exit("Can't set process for goto preset movement: %s\n", service_ctx.get_ptz_node()->get_cstr_err());
-
-                        break;
-
-
-            default:
-                        puts("for more detail see help\n\n");
-                        exit_if_not_daemonized(EXIT_FAILURE);
-                        break;
-        }
-    }
-}
-
-
-
-void check_service_ctx(void)
-{
-    if(service_ctx.eth_ifs.empty())
-        daemon_error_exit("Error: not set no one ehternet interface more details see opt --ifs\n");
-
-
-    if(service_ctx.scopes.empty())
-        daemon_error_exit("Error: not set scopes more details see opt --scope\n");
-
-
-    if(service_ctx.get_profiles().empty())
-        daemon_error_exit("Error: not set no one profile more details see --help\n");
-}
-
-
-
-void init_gsoap(void)
-{
-    soap = soap_new();
-
-    if(!soap)
-        daemon_error_exit("Can't get mem for SOAP\n");
-
-
-    soap->bind_flags = SO_REUSEADDR;
-
-    if( !soap_valid_socket(soap_bind(soap, NULL, service_ctx.port, 10)) )
-    {
-        soap_stream_fault(soap, std::cerr);
-        exit(EXIT_FAILURE);
-    }
-
-    soap->send_timeout = 3; // timeout in sec
-    soap->recv_timeout = 3; // timeout in sec
-
-
-    //save pointer of service_ctx in soap
-    soap->user = (void*)&service_ctx;
-}
-
-
-
-void init(void *data)
-{
-    UNUSED(data);
-    init_signals();
-    check_service_ctx();
-    init_gsoap();
-}
-
-
-
-int main(int argc, char *argv[])
-{
-    processing_cmd(argc, argv);
-    daemonize2(init, NULL);
-
-    FOREACH_SERVICE(DECLARE_SERVICE, soap)
-
-    while( true )
-    {
-        // wait new client
-        if( !soap_valid_socket(soap_accept(soap)) )
-        {
-            soap_stream_fault(soap, std::cerr);
-            return EXIT_FAILURE;
-        }
-
-
-        // process service
-        if( soap_begin_serve(soap) )
-        {
-            soap_stream_fault(soap, std::cerr);
-        }
-        FOREACH_SERVICE(DISPATCH_SERVICE, soap)
-        else
-        {
-            DEBUG_MSG("Unknown service\n");
-        }
-
-        soap_destroy(soap); // delete managed C++ objects
-        soap_end(soap);     // delete managed memory
-    }
-
-
-    return EXIT_FAILURE; // Error, normal exit from the main loop only through the signal handler.
-}
diff --git a/src/onvif_srvd/onvif_srvd/src/smacros.h b/src/onvif_srvd/onvif_srvd/src/smacros.h
deleted file mode 100644
index 71b91ec..0000000
--- a/src/onvif_srvd/onvif_srvd/src/smacros.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * smacros.h
- *
- *
- * version 1.1
- *
- *
- * BSD 3-Clause License
- *
- * Copyright (c) 2015, Koynov Stas - skojnov@yandex.ru
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- * more details see https://github.com/KoynovStas/smacros
- */
-
-#ifndef SMACROS_HEADER
-#define SMACROS_HEADER
-
-
-#include <stdint.h>
-#include <stddef.h>  //for offsetof
-
-
-
-
-
-#ifdef  __cplusplus
-        #define  EXTERN_PREFIX extern "C"
-#else
-        #define  EXTERN_PREFIX extern
-#endif
-
-
-
-
-
-#define  SET_BIT(reg, num_bit)   ( (reg) |=  (1 << (num_bit)) )
-#define  CLR_BIT(reg, num_bit)   ( (reg) &= ~(1 << (num_bit)) )
-#define  INV_BIT(reg, num_bit)   ( (reg) ^=  (1 << (num_bit)) )
-
-
-#define  SET_FLAG(reg, flag)   ( (reg) |=  (flag) )
-#define  CLR_FLAG(reg, flag)   ( (reg) &= ~(flag) )
-#define  INV_FLAG(reg, flag)   ( (reg) ^=  (flag) )
-
-
-
-
-
-//The count of elements in the array.
-#define  COUNT_ELEMENTS(array) (sizeof(array) / sizeof(array[0]))
-
-
-
-
-/*
- * For GCC 4.6 or higher, in C++ you can use a standard right static_assert(exp, msg) in *.c and in *.h files.
- * For GCC 4.6 is required to add CFLAGS += -std="c++0x"
- * Simple C (gcc) have static_assert in std=c11.
- * A lot of variants, it is the most simple and intuitive
- * It can be used in *.c and in *.h files. (macros that use function style can be used in *.c files only)
- *
- * Disadvantages: you can not be set msg to display the console when compiling
- *
- * Example:
- *
- * STATIC_ASSERT( sizeof(char) == 1)  //good job
- * STATIC_ASSERT( sizeof(char) != 1)  //You will get a compilation error
-*/
-#define ASSERT_CONCAT_(a, b) a##b
-#define ASSERT_CONCAT(a, b) ASSERT_CONCAT_(a, b)
-#define STATIC_ASSERT(expr) \
-    enum { ASSERT_CONCAT(assert_line_, __LINE__) = 1/(int)(!!(expr)) }
-
-
-
-
-
-#define DEF_TO_STR_(text) #text
-#define DEF_TO_STR(arg) DEF_TO_STR_(arg)
-
-
-
-
-
-// align must be a power of two.
-// Alignment takes place upwards.
-#define  ALIGNMENT(val, align)  ( ((val) + (align)) & ~( (align) - 1) )
-
-
-
-
-
-// Macros to convert the time in microseconds
-// t  have to have  struct timespec type
-// TIME_IN_USEC2 is fast variant (have not mul)
-#define  TIME_IN_USEC(t)     (uint32_t)(t.tv_usec + t.tv_sec * 1000000)
-#define  TIME_IN_USEC2(t)    (uint32_t)(t.tv_usec + (t.tv_sec << 20) )
-
-
-
-
-
-#define  FREE_AND_NULL(ptr_var)  ({                  \
-                                     free(ptr_var);  \
-                                     ptr_var = NULL; \
-                                  })
-
-
-
-#define  DELETE_AND_NULL(ptr_var) ({                    \
-                                      delete (ptr_var); \
-                                      ptr_var = NULL;   \
-                                   })
-
-
-
-#define  DELETE_ARRAY_AND_NULL(ptr_var) ({                       \
-                                            delete [] (ptr_var); \
-                                            ptr_var = NULL;      \
-                                        })
-
-
-
-
-
-#ifdef  DEBUG
-        #include <stdio.h>
-
-        #define  DEBUG_MSG(...)       printf(__VA_ARGS__)
-        #define  FDEBUG_MSG(fp, ...) fprintf(fp, __VA_ARGS__)
-#else
-        #define  DEBUG_MSG(...)       ({})
-        #define  FDEBUG_MSG(fp, ...)  ({})
-#endif
-
-
-
-#define UNUSED(var) (void)var
-
-
-
-// container_of - cast a member of a structure out to the containing structure
-// ptr:    the pointer to the member.
-// type:   the type of the container struct this is embedded in.
-// member: the name of the member within the struct.
-//
-#define container_of( ptr, type, member ) \
-    ({  (type *)( (const char *)ptr - offsetof(type, member) );  })
-
-
-
-
-/*
- * gSOAP generate a lot of handlers(callbacks) for ONVIF
- * Most of them are empty. Almost everyone takes two arguments,
- * the second is named the first_name + Response.
- * This macro allows you to write the basic behavior in one line:
- * Disable the compiler warning about unused arguments and
- * display a message for the Debug mode.
- */
-#define  SOAP_EMPTY_HANDLER(arg1, str_prefix)      \
-    UNUSED(arg1);                                  \
-    UNUSED(arg1##Response);                        \
-    DEBUG_MSG(str_prefix ": %s\n", __FUNCTION__);  \
-    return SOAP_OK                                 \
-
-
-
-
-
-#endif //SMACROS_HEADER
diff --git a/src/onvif_srvd/onvif_srvd/src/stools.h b/src/onvif_srvd/onvif_srvd/src/stools.h
deleted file mode 100644
index 395d299..0000000
--- a/src/onvif_srvd/onvif_srvd/src/stools.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef STOOLS_H
-#define STOOLS_H
-
-#include <memory>
-#include <limits>
-
-#include "soapH.h"
-
-
-
-
-
-template<typename T>
-T* soap_new_ptr(struct soap* soap, T value)
-{
-    T* ptr = (T*)soap_malloc(soap, sizeof(T));
-    *ptr = value;
-
-    return ptr;
-}
-
-
-
-
-
-#endif // STOOLS_H
diff --git a/src/onvif_srvd/onvif_srvd/start_scripts/S90onvif_srvd b/src/onvif_srvd/onvif_srvd/start_scripts/S90onvif_srvd
deleted file mode 100755
index d57beb9..0000000
--- a/src/onvif_srvd/onvif_srvd/start_scripts/S90onvif_srvd
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-
-DAEMON=onvif_srvd_debug
-DAEMON_PATH=.
-PID_FILE=$DAEMON.pid
-
-DAEMON_ARGS="--pid_file $PID_FILE"
-
-
-# ONVIF Device Service param (more details see help)
-DAEMON_ARGS="$DAEMON_ARGS --ifs eth0"
-DAEMON_ARGS="$DAEMON_ARGS --scope onvif://www.onvif.org/name/TestDev"
-DAEMON_ARGS="$DAEMON_ARGS --scope onvif://www.onvif.org/location/Unknow"
-DAEMON_ARGS="$DAEMON_ARGS --scope onvif://www.onvif.org/Profile/Streaming"
-DAEMON_ARGS="$DAEMON_ARGS --scope onvif://www.onvif.org/Profile/S"
-DAEMON_ARGS="$DAEMON_ARGS --name RTSP --width 800 --height 600 --url rtsp://%s:554/unicast --type JPEG"
-
-
-
-d_start()
-{
-    if [ -f $PID_FILE ] && kill -0 $(cat $PID_FILE); then
-        echo "$DAEMON already running"
-        return 1
-    fi
-
-    echo "Starting $DAEMON..."
-    $DAEMON_PATH/$DAEMON $DAEMON_ARGS && echo "$DAEMON started"
-}
-
-
-
-d_stop()
-{
-    if [ ! -f "$PID_FILE" ] || ! kill -0 $(cat "$PID_FILE"); then
-        echo "$DAEMON not running"
-        return 1
-    fi
-
-    echo "Stopping $DAEMON..."
-    kill -15 $(cat $PID_FILE) && rm -f $PID_FILE
-    echo "$DAEMON stopped"
-}
-
-
-
-case "$1" in
-      start)
-          d_start
-          ;;
-      stop)
-          d_stop
-          ;;
-      restart)
-          echo "Restarting $DAEMON"
-          d_stop
-          d_start
-          ;;
-      *)
-          echo "Usage: $0 {start|stop|restart}"
-          exit 1
-          ;;
-esac
diff --git a/src/onvif_srvd/onvif_srvd/start_scripts/onvif_srvd.service b/src/onvif_srvd/onvif_srvd/start_scripts/onvif_srvd.service
deleted file mode 100644
index 732bd72..0000000
--- a/src/onvif_srvd/onvif_srvd/start_scripts/onvif_srvd.service
+++ /dev/null
@@ -1,31 +0,0 @@
-[Unit]
-Description=ONVIF Device(IP camera) Service server
-After=syslog.target
-After=network-online.target
-
-
-
-[Service]
-Type=forking
-WorkingDirectory=/home/xxx/bin
-PIDFile=/tmp/onvif_srvd.pid
-ExecStart=/home/xxx/bin/onvif_srvd \
-	--pid_file /tmp/onvif_srvd.pid \
-	--ifs eth0 \
-	--scope onvif://www.onvif.org/name/TestDev \
-	--scope onvif://www.onvif.org/location/Unknow \
-	--scope onvif://www.onvif.org/Profile/Streaming \
-	--scope onvif://www.onvif.org/Profile/S \
-	--name RTSP --width 1200 --height 720 --url rtsp://%%s:554/unicast --type JPEG
-
-TimeoutSec=4
-
-
-
-Restart=always
-RestartSec=2
-StartLimitBurst=0
-
-
-[Install]
-WantedBy=multi-user.target
diff --git a/src/onvif_srvd/onvif_srvd/wsdl/b-2.xsd b/src/onvif_srvd/onvif_srvd/wsdl/b-2.xsd
deleted file mode 100644
index 5c5b04d..0000000
--- a/src/onvif_srvd/onvif_srvd/wsdl/b-2.xsd
+++ /dev/null
@@ -1,580 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-
-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004-2006). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
--->
-
-<xsd:schema 
-  targetNamespace="http://docs.oasis-open.org/wsn/b-2"   
-  xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
-  xmlns:wsa="http://www.w3.org/2005/08/addressing"
-  xmlns:wsrf-bf="http://docs.oasis-open.org/wsrf/bf-2"
-  xmlns:wstop="http://docs.oasis-open.org/wsn/t-1"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-  elementFormDefault="qualified"  attributeFormDefault="unqualified">
-
-<!-- ======================== Imports  ============================ -->
-  
-  <xsd:import namespace="http://www.w3.org/2005/08/addressing"
-              schemaLocation="http://www.w3.org/2005/08/addressing/ws-addr.xsd" 
-  />
-
-  <xsd:import namespace="http://docs.oasis-open.org/wsrf/bf-2"
-              schemaLocation="http://docs.oasis-open.org/wsrf/bf-2.xsd" 
-  />
-  <xsd:import namespace="http://docs.oasis-open.org/wsn/t-1"
-              schemaLocation="http://docs.oasis-open.org/wsn/t-1.xsd" 
-  />
-  
-<!-- ===================== Misc. Helper Types ===================== -->
-
-  <xsd:complexType name="QueryExpressionType" mixed="true">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="1" processContents="lax" />
-    </xsd:sequence>
-    <xsd:attribute name="Dialect" type="xsd:anyURI" use="required"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="TopicExpressionType" mixed="true">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="1" processContents="lax" />
-    </xsd:sequence>
-    <xsd:attribute name="Dialect" type="xsd:anyURI" use="required" />
-    <xsd:anyAttribute/>
-  </xsd:complexType>
-
-  <xsd:complexType name="FilterType">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="SubscriptionPolicyType">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<!-- =============== Resource Property Related  =================== -->
-<!-- ======== Resource Properties for NotificationProducer ======== -->
-  <xsd:element name="TopicExpression" type="wsnt:TopicExpressionType"/>
-  <xsd:element name="FixedTopicSet" type="xsd:boolean" default="true"/>
-  <xsd:element name="TopicExpressionDialect" type="xsd:anyURI"/>
-              
-  <xsd:element name="NotificationProducerRP">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element ref="wsnt:TopicExpression"        
-                     minOccurs="0" maxOccurs="unbounded" />
-        <xsd:element ref="wsnt:FixedTopicSet"        
-                     minOccurs="0" maxOccurs="1" />
-        <xsd:element ref="wsnt:TopicExpressionDialect"
-                     minOccurs="0" maxOccurs="unbounded" />
-        <xsd:element ref="wstop:TopicSet"
-                     minOccurs="0" maxOccurs="1" />
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-<!-- ======== Resource Properties for SubscriptionManager ========= -->       
-  <xsd:element name="ConsumerReference" 
-               type="wsa:EndpointReferenceType" />
-  <xsd:element name="Filter" type="wsnt:FilterType" />
-  <xsd:element name="SubscriptionPolicy"                                                                                                                                                                   		      type="wsnt:SubscriptionPolicyType" />
-
-
-  <xsd:element name="CreationTime" type="xsd:dateTime" />
-  
-  <xsd:element name="SubscriptionManagerRP" >
-    <xsd:complexType>
-      <xsd:sequence>
-         <xsd:element ref="wsnt:ConsumerReference"        
-                      minOccurs="1" maxOccurs="1" />
-         <xsd:element ref="wsnt:Filter"
-                      minOccurs="0" maxOccurs="1" />
-         <xsd:element ref="wsnt:SubscriptionPolicy" 
-                      minOccurs="0" maxOccurs="1" />
-         <xsd:element ref="wsnt:CreationTime" 
-                      minOccurs="0" maxOccurs="1" />
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-<!-- ================= Notification Metadata  ===================== -->
-  <xsd:element name="SubscriptionReference" 
-               type="wsa:EndpointReferenceType" />
-  <xsd:element name="Topic" 
-               type="wsnt:TopicExpressionType" />
-  <xsd:element name="ProducerReference" 
-               type="wsa:EndpointReferenceType" />
-
-<!-- ================== Message Helper Types  ===================== -->
-  <xsd:complexType name="NotificationMessageHolderType" >
-    <xsd:sequence>
-      <xsd:element ref="wsnt:SubscriptionReference" 
-                   minOccurs="0" maxOccurs="1" />
-      <xsd:element ref="wsnt:Topic" 
-                   minOccurs="0" maxOccurs="1" />
-      <xsd:element ref="wsnt:ProducerReference" 
-                   minOccurs="0" maxOccurs="1" />
-      <xsd:element name="Message">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any namespace="##any" processContents="lax"
-                     minOccurs="1" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:element name="NotificationMessage"
-               type="wsnt:NotificationMessageHolderType"/>
-
-<!-- ========== Message Types for NotificationConsumer  =========== -->
-  <xsd:element name="Notify" >
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element ref="wsnt:NotificationMessage"
-                     minOccurs="1" maxOccurs="unbounded" />
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-<!-- ========== Message Types for NotificationProducer  =========== -->
-
-  <xsd:simpleType name="AbsoluteOrRelativeTimeType">
-    <xsd:union memberTypes="xsd:dateTime xsd:duration" />
-  </xsd:simpleType>
-
-  <xsd:element name="CurrentTime" type="xsd:dateTime" />
-
-  <xsd:element name="TerminationTime" 
-               nillable="true" type="xsd:dateTime" />
-
-  <xsd:element name="ProducerProperties"
-               type="wsnt:QueryExpressionType" />
-
-  <xsd:element name="MessageContent"
-               type="wsnt:QueryExpressionType" />
-
-  <xsd:element name="UseRaw"><xsd:complexType/></xsd:element>
-
-  <xsd:element name="Subscribe" >
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="ConsumerReference" 
-                     type="wsa:EndpointReferenceType"
-                     minOccurs="1" maxOccurs="1" />
-        <xsd:element name="Filter" 
-                     type="wsnt:FilterType" 
-                     minOccurs="0" maxOccurs="1" />
-        <xsd:element name="InitialTerminationTime" 
-                     type="wsnt:AbsoluteOrRelativeTimeType"
-                     nillable="true"
-                     minOccurs="0" maxOccurs="1" />
-        <xsd:element name="SubscriptionPolicy"
-                     minOccurs="0" maxOccurs="1">
-          <xsd:complexType>
-            <xsd:sequence>
-              <xsd:any namespace="##any" processContents="lax"
-                       minOccurs="0" maxOccurs="unbounded"/>
-            </xsd:sequence>
-          </xsd:complexType>
-        </xsd:element>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-        
-  <xsd:element name="SubscribeResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="SubscriptionReference" 
-                     type="wsa:EndpointReferenceType"
-                     minOccurs="1" maxOccurs="1" />
-        <xsd:element ref="wsnt:CurrentTime"
-                     minOccurs="0" maxOccurs="1" />
-        <xsd:element ref="wsnt:TerminationTime"
-                     minOccurs="0" maxOccurs="1" />
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-                  
-  <xsd:element name="GetCurrentMessage">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="Topic" 
-                     type="wsnt:TopicExpressionType" />
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="GetCurrentMessageResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:complexType name="SubscribeCreationFailedFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="SubscribeCreationFailedFault" 
-               type="wsnt:SubscribeCreationFailedFaultType"/>
-
-  <xsd:complexType name="InvalidFilterFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType">
-        <xsd:sequence>
-          <xsd:element name="UnknownFilter" type="xsd:QName"
-                       minOccurs="1" maxOccurs="unbounded"/>
-        </xsd:sequence>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="InvalidFilterFault"
-               type="wsnt:InvalidFilterFaultType"/>
-
-  <xsd:complexType name="TopicExpressionDialectUnknownFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="TopicExpressionDialectUnknownFault" 
-               type="wsnt:TopicExpressionDialectUnknownFaultType"/>
-
-  <xsd:complexType name="InvalidTopicExpressionFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="InvalidTopicExpressionFault" 
-               type="wsnt:InvalidTopicExpressionFaultType"/>
-
-  <xsd:complexType name="TopicNotSupportedFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="TopicNotSupportedFault" 
-               type="wsnt:TopicNotSupportedFaultType"/>
-
-  <xsd:complexType name="MultipleTopicsSpecifiedFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="MultipleTopicsSpecifiedFault" 
-               type="wsnt:MultipleTopicsSpecifiedFaultType"/>
-
-  <xsd:complexType name="InvalidProducerPropertiesExpressionFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="InvalidProducerPropertiesExpressionFault" 
-             type="wsnt:InvalidProducerPropertiesExpressionFaultType"/>
-
-  <xsd:complexType name="InvalidMessageContentExpressionFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="InvalidMessageContentExpressionFault" 
-             type="wsnt:InvalidMessageContentExpressionFaultType"/>
-
-  <xsd:complexType name="UnrecognizedPolicyRequestFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType">
-		<xsd:sequence>
-             <xsd:element name="UnrecognizedPolicy" type="xsd:QName"
-                           minOccurs="0" maxOccurs="unbounded"/>
-         </xsd:sequence>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="UnrecognizedPolicyRequestFault" 
-             type="wsnt:UnrecognizedPolicyRequestFaultType"/>
-
-  <xsd:complexType name="UnsupportedPolicyRequestFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType">
-		<xsd:sequence>
-             <xsd:element name="UnsupportedPolicy" type="xsd:QName"
-                           minOccurs="0" maxOccurs="unbounded"/>
-         </xsd:sequence>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="UnsupportedPolicyRequestFault" 
-             type="wsnt:UnsupportedPolicyRequestFaultType"/>
-
-  <xsd:complexType name="NotifyMessageNotSupportedFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="NotifyMessageNotSupportedFault" 
-             type="wsnt:NotifyMessageNotSupportedFaultType"/>
-
-  <xsd:complexType name="UnacceptableInitialTerminationTimeFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType">
-        <xsd:sequence>
-          <xsd:element name="MinimumTime" type="xsd:dateTime"/>
-          <xsd:element name="MaximumTime" type="xsd:dateTime"
-              minOccurs="0"/>
-        </xsd:sequence>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="UnacceptableInitialTerminationTimeFault"
-              type="wsnt:UnacceptableInitialTerminationTimeFaultType"/>
-
-  <xsd:complexType name="NoCurrentMessageOnTopicFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="NoCurrentMessageOnTopicFault" 
-               type="wsnt:NoCurrentMessageOnTopicFaultType"/>
-
-<!-- ======== Message Types for PullPoint  ======================== -->
-  <xsd:element name="GetMessages">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="MaximumNumber" 
-                     type="xsd:nonNegativeInteger"
-                     minOccurs="0"/>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:anyAttribute/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="GetMessagesResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element ref="wsnt:NotificationMessage" 
-                     minOccurs="0" maxOccurs="unbounded" />
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:anyAttribute/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="DestroyPullPoint">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:anyAttribute/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="DestroyPullPointResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:anyAttribute/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:complexType name="UnableToGetMessagesFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-
-  <xsd:element name="UnableToGetMessagesFault" 
-               type="wsnt:UnableToGetMessagesFaultType"/>
-
-<xsd:complexType name="UnableToDestroyPullPointFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-
-  <xsd:element name="UnableToDestroyPullPointFault" 
-               type="wsnt:UnableToDestroyPullPointFaultType"/>
-
-<!-- ======== Message Types for Create PullPoint  ================= -->
-  <xsd:element name="CreatePullPoint">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:anyAttribute/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="CreatePullPointResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="PullPoint"
-                     type="wsa:EndpointReferenceType"/>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:anyAttribute/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:complexType name="UnableToCreatePullPointFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="UnableToCreatePullPointFault" 
-               type="wsnt:UnableToCreatePullPointFaultType"/>
-
-<!-- ======== Message Types for Base SubscriptionManager  ========= -->
-  <xsd:element name="Renew">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="TerminationTime" 
-                     type="wsnt:AbsoluteOrRelativeTimeType"
-                     nillable="true"
-                     minOccurs="1" maxOccurs="1" />
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="RenewResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element ref="wsnt:TerminationTime" 
-                      minOccurs="1" maxOccurs="1" />
-        <xsd:element ref="wsnt:CurrentTime" 
-                      minOccurs="0" maxOccurs="1" />
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:complexType name="UnacceptableTerminationTimeFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType">
-        <xsd:sequence>
-          <xsd:element name="MinimumTime" type="xsd:dateTime"/>
-          <xsd:element name="MaximumTime" type="xsd:dateTime"
-              minOccurs="0"/>
-        </xsd:sequence>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="UnacceptableTerminationTimeFault"
-              type="wsnt:UnacceptableTerminationTimeFaultType"/>
-
-  <xsd:element name="Unsubscribe">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="UnsubscribeResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:complexType name="UnableToDestroySubscriptionFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="UnableToDestroySubscriptionFault" 
-               type="wsnt:UnableToDestroySubscriptionFaultType"/>
-
-<!-- ====== Message Types for Pausable SubscriptionManager  ======= -->
-
-  <xsd:element name="PauseSubscription">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="PauseSubscriptionResponse" >
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="ResumeSubscription">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="ResumeSubscriptionResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:complexType name="PauseFailedFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="PauseFailedFault" 
-               type="wsnt:PauseFailedFaultType"/>
-
-  <xsd:complexType name="ResumeFailedFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="ResumeFailedFault" 
-               type="wsnt:ResumeFailedFaultType"/>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/src/onvif_srvd/onvif_srvd/wsdl/bf-2.xsd b/src/onvif_srvd/onvif_srvd/wsdl/bf-2.xsd
deleted file mode 100644
index 578ad30..0000000
--- a/src/onvif_srvd/onvif_srvd/wsdl/bf-2.xsd
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-   OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementers or users of this specification, can be obtained from the OASIS Executive Director. 
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director. 
-
-Copyright (C) OASIS Open (2005). All Rights Reserved. 
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. 
--->
-
-<xsd:schema 
-  xmlns="http://www.w3.org/2001/XMLSchema" 
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:wsa="http://www.w3.org/2005/08/addressing"
-  xmlns:wsrf-bf=
-    "http://docs.oasis-open.org/wsrf/bf-2" 
-  elementFormDefault="qualified" attributeFormDefault="unqualified" 
-  targetNamespace=
-    "http://docs.oasis-open.org/wsrf/bf-2">
-  <xsd:import
-     namespace="http://www.w3.org/2005/08/addressing" 
-     schemaLocation=
-              "http://www.w3.org/2005/08/addressing/ws-addr.xsd"/>
-              
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" 
-              schemaLocation="http://www.w3.org/2001/xml.xsd">
-    <xsd:annotation>
-      <xsd:documentation>
-        Get access to the xml: attribute groups for xml:lang as declared on 'schema'
-        and 'documentation' below
-      </xsd:documentation> 
-    </xsd:annotation>
-  </xsd:import>
-<!-- ====================== BaseFault Types ======================= -->
-      
-  <xsd:element name="BaseFault" type="wsrf-bf:BaseFaultType"/>
-  
-  <xsd:complexType name="BaseFaultType">
-    <xsd:sequence>
-      <xsd:any namespace="##other" processContents="lax"
-              minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="Timestamp" type="xsd:dateTime" 
-               minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="Originator" type="wsa:EndpointReferenceType" 
-               minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="ErrorCode" 
-               minOccurs="0" maxOccurs="1">
-        <xsd:complexType>
-          <xsd:complexContent mixed="true">
-            <xsd:extension base="xsd:anyType">
-              <xsd:attribute name="dialect" type="xsd:anyURI"
-                         use="required"/>
-            </xsd:extension>
-          </xsd:complexContent>
-        </xsd:complexType>      
-      </xsd:element>
-
-      <xsd:element name="Description" 
-               minOccurs="0" maxOccurs="unbounded">
-        <xsd:complexType>
-          <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-              <xsd:attribute ref="xml:lang" use="optional"/>
-            </xsd:extension>
-          </xsd:simpleContent>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="FaultCause" minOccurs="0" maxOccurs="1">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any namespace="##other" processContents="lax" 
-                     minOccurs="1" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType> 
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:anyAttribute namespace="##other" processContents="lax"/>
- </xsd:complexType>
-</xsd:schema>
diff --git a/src/onvif_srvd/onvif_srvd/wsdl/common.xsd b/src/onvif_srvd/onvif_srvd/wsdl/common.xsd
deleted file mode 100644
index 44ba72c..0000000
--- a/src/onvif_srvd/onvif_srvd/wsdl/common.xsd
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--W3C XML Schema generated by XMLSpy v2017 (x64) (http://www.altova.com)-->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tt="http://www.onvif.org/ver10/schema" xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2" targetNamespace="http://www.onvif.org/ver10/schema" elementFormDefault="qualified" version="16.12">
-    <!--===============================-->
-    <!--    Start PTZ Related Types    -->
-    <!--===============================-->
-	<xs:complexType name="Vector2D">
-		<xs:attribute name="x" type="xs:float" use="required"/>
-		<xs:attribute name="y" type="xs:float" use="required"/>
-		<xs:attribute name="space" type="xs:anyURI" use="optional">
-			<xs:annotation>
-				<xs:documentation>
-  				Pan/tilt coordinate space selector. The following options are defined:<ul>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/PositionGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/TranslationGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/VelocityGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/GenericSpeedSpace</li>
-					</ul>
-				</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="Vector1D">
-		<xs:attribute name="x" type="xs:float" use="required"/>
-		<xs:attribute name="space" type="xs:anyURI" use="optional">
-			<xs:annotation>
-				<xs:documentation>
-				Zoom coordinate space selector. The following options are defined:<ul style="">
-						<li> http://www.onvif.org/ver10/tptz/ZoomSpaces/PositionGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/ZoomSpaces/TranslationGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/ZoomSpaces/VelocityGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/ZoomSpaces/ZoomGenericSpeedSpace</li>
-					</ul>
-				</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="PTZVector">
-		<xs:sequence>
-			<xs:element name="PanTilt" type="tt:Vector2D" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Pan and tilt position. The x component corresponds to pan and the y component to tilt.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Zoom" type="tt:Vector1D" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            A zoom position.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="PTZStatus">
-		<xs:sequence>
-			<xs:element name="Position" type="tt:PTZVector" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            Specifies the absolute position of the PTZ unit together with the Space references. The default absolute spaces of the corresponding PTZ configuration MUST be referenced within the Position element.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MoveStatus" type="tt:PTZMoveStatus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            Indicates if the Pan/Tilt/Zoom device unit is currently moving, idle or in an unknown state.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Error" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            States a current PTZ error.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="UtcTime" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>
-            Specifies the UTC time when this status was generated.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>	<!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<xs:complexType name="PTZMoveStatus">
-		<xs:sequence>
-			<xs:element name="PanTilt" type="tt:MoveStatus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Zoom" type="tt:MoveStatus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:simpleType name="MoveStatus">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="IDLE"/>
-			<xs:enumeration value="MOVING"/>
-			<xs:enumeration value="UNKNOWN"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<!--  Event and Analytics Types    -->
-	<!--===============================-->
-	<xs:complexType name="Vector">
-		<xs:attribute name="x" type="xs:float"/>
-		<xs:attribute name="y" type="xs:float"/>
-	</xs:complexType>
-	<xs:complexType name="Rectangle">
-		<xs:attribute name="bottom" type="xs:float"/>
-		<xs:attribute name="top" type="xs:float"/>
-		<xs:attribute name="right" type="xs:float"/>
-		<xs:attribute name="left" type="xs:float"/>
-	</xs:complexType>
-	<xs:complexType name="Polygon">
-		<xs:sequence>
-			<xs:element name="Point" type="tt:Vector" minOccurs="3" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Polygon" type="tt:Polygon"/>
-	<xs:complexType name="Color">
-		<xs:attribute name="X" type="xs:float" use="required"/>
-		<xs:attribute name="Y" type="xs:float" use="required"/>
-		<xs:attribute name="Z" type="xs:float" use="required"/>
-		<xs:attribute name="Colorspace" type="xs:anyURI"/>
-	</xs:complexType>
-	<xs:complexType name="ColorCovariance">
-		<xs:attribute name="XX" type="xs:float" use="required"/>
-		<xs:attribute name="YY" type="xs:float" use="required"/>
-		<xs:attribute name="ZZ" type="xs:float" use="required"/>
-		<xs:attribute name="XY" type="xs:float"/>
-		<xs:attribute name="XZ" type="xs:float"/>
-		<xs:attribute name="YZ" type="xs:float"/>
-		<xs:attribute name="Colorspace" type="xs:anyURI"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--       Scene Description Types -->
-	<!--===============================-->
-	<xs:complexType name="Transformation">
-		<xs:sequence>
-			<xs:element name="Translate" type="tt:Vector" minOccurs="0"/>
-			<xs:element name="Scale" type="tt:Vector" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:TransformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<xs:complexType name="TransformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>	<!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-</xs:schema>
diff --git a/src/onvif_srvd/onvif_srvd/wsdl/devicemgmt.wsdl b/src/onvif_srvd/onvif_srvd/wsdl/devicemgmt.wsdl
deleted file mode 100644
index 0c0c6a0..0000000
--- a/src/onvif_srvd/onvif_srvd/wsdl/devicemgmt.wsdl
+++ /dev/null
@@ -1,4207 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" href="../../../ver20/util/onvif-wsdl-viewer.xsl"?>
-<!--
-Copyright (c) 2008-2014 by ONVIF: Open Network Video Interface Forum. All rights reserved.
-
-Recipients of this document may copy, distribute, publish, or display this document so long as this copyright notice, license and disclaimer are retained with all copies of the document. No license is granted to modify this document.
-
-THIS DOCUMENT IS PROVIDED "AS IS," AND THE CORPORATION AND ITS MEMBERS AND THEIR AFFILIATES, MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THIS DOCUMENT ARE SUITABLE FOR ANY PURPOSE; OR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT, WHETHER OR NOT (1) THE CORPORATION, MEMBERS OR THEIR AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR (2) SUCH DAMAGES WERE REASONABLY FORESEEABLE, AND ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT.  THE FOREGOING DISCLAIMER AND LIMITATION ON LIABILITY DO NOT APPLY TO, INVALIDATE, OR LIMIT REPRESENTATIONS AND WARRANTIES MADE BY THE MEMBERS AND THEIR RESPECTIVE AFFILIATES TO THE CORPORATION AND OTHER MEMBERS IN CERTAIN WRITTEN POLICIES OF THE CORPORATION.
--->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tds="http://www.onvif.org/ver10/device/wsdl" targetNamespace="http://www.onvif.org/ver10/device/wsdl">
-	<wsdl:types>
-		<xs:schema targetNamespace="http://www.onvif.org/ver10/device/wsdl" xmlns:tt="http://www.onvif.org/ver10/schema" xmlns:tds="http://www.onvif.org/ver10/device/wsdl" elementFormDefault="qualified" version="16.12">
-			<xs:import namespace="http://www.onvif.org/ver10/schema" schemaLocation="../../../ver10/schema/onvif.xsd"/>
-			<!--===============================-->
-			<xs:element name="GetServices">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="IncludeCapability" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>Indicates if the service capabilities (untyped) should be included in the response.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetServicesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Service" type="tds:Service" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Each Service element contains information about one service.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:complexType name="Service">
-				<xs:sequence>
-					<xs:element name="Namespace" type="xs:anyURI">
-						<xs:annotation>
-							<xs:documentation>Namespace of the service being described. This parameter allows to match the service capabilities to the service. Note that only one set of capabilities is supported per namespace.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="XAddr" type="xs:anyURI">
-						<xs:annotation>
-							<xs:documentation>The transport addresses where the service can be reached. The scheme and IP part shall match the one used in the request (i.e. the GetServices request).</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Capabilities" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:any namespace="##any" processContents="lax">
-									<xs:annotation>
-										<xs:documentation>The placeholder for the service capabilities. The service capability element shall be returned here. For example for the device service that would be the tds:DeviceServiceCapabilities element (not complextype).</xs:documentation>
-									</xs:annotation>
-								</xs:any>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="Version" type="tt:OnvifVersion">
-						<xs:annotation>
-							<xs:documentation>The version of the service (not the ONVIF core spec version).</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<!--===============================-->
-			<xs:element name="GetServiceCapabilities">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetServiceCapabilitiesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Capabilities" type="tds:DeviceServiceCapabilities">
-							<xs:annotation>
-								<xs:documentation>The capabilities for the device service is returned in the Capabilities element.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:complexType name="DeviceServiceCapabilities">
-				<xs:sequence>
-					<xs:element name="Network" type="tds:NetworkCapabilities">
-						<xs:annotation>
-							<xs:documentation>Network capabilities.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Security" type="tds:SecurityCapabilities">
-						<xs:annotation>
-							<xs:documentation>Security capabilities.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="System" type="tds:SystemCapabilities">
-						<xs:annotation>
-							<xs:documentation>System capabilities.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Misc" type="tds:MiscCapabilities" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Capabilities that do not fit in any of the other categories.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="Capabilities" type="tds:DeviceServiceCapabilities"/>
-			<!--===============================-->
-			<xs:complexType name="NetworkCapabilities">
-				<xs:attribute name="IPFilter" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for IP filtering.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="ZeroConfiguration" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for zeroconf.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="IPVersion6" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for IPv6.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="DynDNS" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for dynamic DNS configuration.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="Dot11Configuration" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for IEEE 802.11 configuration.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="Dot1XConfigurations" type="xs:int">
-					<xs:annotation>
-						<xs:documentation>Indicates the maximum number of Dot1X configurations supported by the device</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="HostnameFromDHCP" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for retrieval of hostname from DHCP.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="NTP" type="xs:int">
-					<xs:annotation>
-						<xs:documentation>Maximum number of NTP servers supported by the devices SetNTP command.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="DHCPv6" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for Stateful IPv6 DHCP.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<!--===============================-->
-			<xs:simpleType name="EAPMethodTypes">
-				<xs:list itemType="xs:int"/>
-			</xs:simpleType>
-			<xs:complexType name="SecurityCapabilities">
-				<xs:attribute name="TLS1.0" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for TLS 1.0.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="TLS1.1" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for TLS 1.1.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="TLS1.2" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for TLS 1.2.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="OnboardKeyGeneration" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for onboard key generation.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="AccessPolicyConfig" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for access policy configuration.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="DefaultAccessPolicy" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for the ONVIF default access policy.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="Dot1X" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for IEEE 802.1X configuration.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="RemoteUserHandling" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for remote user configuration. Used when accessing another device.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="X.509Token" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for WS-Security X.509 token.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="SAMLToken" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for WS-Security SAML token.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="KerberosToken" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for WS-Security Kerberos token.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="UsernameToken" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for WS-Security Username token.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="HttpDigest" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for WS over HTTP digest authenticated communication layer.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="RELToken" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for WS-Security REL token.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="SupportedEAPMethods" type="tds:EAPMethodTypes">
-					<xs:annotation>
-						<xs:documentation>EAP Methods supported by the device. The int values refer to the <a href="http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml">IANA EAP Registry</a>.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="MaxUsers" type="xs:int">
-					<xs:annotation>
-						<xs:documentation>The maximum number of users that the device supports.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="MaxUserNameLength" type="xs:int">
-					<xs:annotation>
-						<xs:documentation>Maximum number of characters supported for the username by CreateUsers.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="MaxPasswordLength" type="xs:int">
-					<xs:annotation>
-						<xs:documentation>Maximum number of characters supported for the password by CreateUsers and SetUser.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<!--===============================-->
-			<xs:complexType name="SystemCapabilities">
-				<xs:attribute name="DiscoveryResolve" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for WS Discovery resolve requests.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="DiscoveryBye" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for WS-Discovery Bye.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="RemoteDiscovery" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for remote discovery.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="SystemBackup" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for system backup through MTOM.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="SystemLogging" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for retrieval of system logging through MTOM.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="FirmwareUpgrade" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for firmware upgrade through MTOM.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="HttpFirmwareUpgrade" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for firmware upgrade through HTTP.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="HttpSystemBackup" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for system backup through HTTP.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="HttpSystemLogging" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for retrieval of system logging through HTTP.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="HttpSupportInformation" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for retrieving support information through HTTP.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="StorageConfiguration" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for storage configuration interfaces.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="MaxStorageConfigurations" type="xs:int">
-					<xs:annotation>
-						<xs:documentation>Indicates maximum number of storage configurations supported.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="GeoLocationEntries" type="xs:int">
-					<xs:annotation>
-						<xs:documentation>If present signals support for geo location. The value signals the supported number of entries.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="AutoGeo" type="xs:string">
-					<xs:annotation>
-						<xs:documentation>Signals support for automatic retrieval of geo location.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<!--===============================-->
-			<xs:complexType name="MiscCapabilities">
-				<xs:attribute name="AuxiliaryCommands" type="tt:StringAttrList">
-					<xs:annotation>
-						<xs:documentation>Lists of commands supported by SendAuxiliaryCommand.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<!--===============================-->
-			<xs:element name="GetDeviceInformation">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDeviceInformationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Manufacturer" type="xs:string">
-							<xs:annotation>
-								<xs:documentation>The manufactor of the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Model" type="xs:string">
-							<xs:annotation>
-								<xs:documentation>The device model.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="FirmwareVersion" type="xs:string">
-							<xs:annotation>
-								<xs:documentation>The firmware version in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="SerialNumber" type="xs:string">
-							<xs:annotation>
-								<xs:documentation>The serial number of the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="HardwareId" type="xs:string">
-							<xs:annotation>
-								<xs:documentation>The hardware ID of the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetSystemDateAndTime">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="DateTimeType" type="tt:SetDateTimeType">
-							<xs:annotation>
-								<xs:documentation>Defines if the date and time is set via NTP or manually.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="DaylightSavings" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>Automatically adjust Daylight savings if defined in TimeZone.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="TimeZone" type="tt:TimeZone" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>The time zone in POSIX 1003.1 format</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="UTCDateTime" type="tt:DateTime" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Date and time in UTC. If time is obtained via NTP, UTCDateTime has no meaning</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetSystemDateAndTimeResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetSystemDateAndTime">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetSystemDateAndTimeResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="SystemDateAndTime" type="tt:SystemDateTime">
-							<xs:annotation>
-								<xs:documentation>Contains information whether system date and time are set manually or by NTP, daylight savings is on or off, time zone in POSIX 1003.1 format and system date and time in UTC and also local system date and time.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetSystemFactoryDefault">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="FactoryDefault" type="tt:FactoryDefaultType">
-							<xs:annotation>
-								<xs:documentation>Specifies the factory default action type.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetSystemFactoryDefaultResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="UpgradeSystemFirmware">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Firmware" type="tt:AttachmentData"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="UpgradeSystemFirmwareResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Message" type="xs:string" minOccurs="0" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SystemReboot">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SystemRebootResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Message" type="xs:string">
-							<xs:annotation>
-								<xs:documentation>Contains the reboot message sent by the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RestoreSystem">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="BackupFiles" type="tt:BackupFile" minOccurs="1" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RestoreSystemResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetSystemBackup">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetSystemBackupResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="BackupFiles" type="tt:BackupFile" minOccurs="1" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetSystemSupportInformation">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetSystemSupportInformationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="SupportInformation" type="tt:SupportInformation">
-							<xs:annotation>
-								<xs:documentation>Contains the arbitary device diagnostics information.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetSystemLog">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="LogType" type="tt:SystemLogType">
-							<xs:annotation>
-								<xs:documentation>Specifies the type of system log to get.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetSystemLogResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="SystemLog" type="tt:SystemLog">
-							<xs:annotation>
-								<xs:documentation>Contains the system log information.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetScopes">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetScopesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Scopes" type="tt:Scope" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of URI definining the device scopes. Scope parameters can be of two types: fixed and configurable. Fixed parameters can not be altered.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetScopes">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Scopes" type="xs:anyURI" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of scope parameters that will replace all existing configurable scope parameters.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetScopesResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddScopes">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ScopeItem" type="xs:anyURI" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of new configurable scope parameters that will be added to the existing configurable scope.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddScopesResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveScopes">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ScopeItem" type="xs:anyURI" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of URIs that should be removed from the device scope.<br/>
-									Note that the response message always will match the request or an error will be returned. The use of the response is for that reason deprecated.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveScopesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ScopeItem" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of URIs that has been removed from the device scope</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetDiscoveryMode">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDiscoveryModeResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="DiscoveryMode" type="tt:DiscoveryMode">
-							<xs:annotation>
-								<xs:documentation>
-									Indicator of discovery mode: Discoverable, NonDiscoverable.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetDiscoveryMode">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="DiscoveryMode" type="tt:DiscoveryMode">
-							<xs:annotation>
-								<xs:documentation>
-									Indicator of discovery mode: Discoverable, NonDiscoverable.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetDiscoveryModeResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetRemoteDiscoveryMode">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetRemoteDiscoveryModeResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RemoteDiscoveryMode" type="tt:DiscoveryMode">
-							<xs:annotation>
-								<xs:documentation>
-									Indicator of discovery mode: Discoverable, NonDiscoverable.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetRemoteDiscoveryMode">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RemoteDiscoveryMode" type="tt:DiscoveryMode">
-							<xs:annotation>
-								<xs:documentation>
-									Indicator of discovery mode: Discoverable, NonDiscoverable.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetRemoteDiscoveryModeResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetDPAddresses">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDPAddressesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="DPAddress" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetDPAddresses">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="DPAddress" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetDPAddressesResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetEndpointReference">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetEndpointReferenceResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GUID" type="xs:string"/>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetRemoteUser">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetRemoteUserResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RemoteUser" type="tt:RemoteUser" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetRemoteUser">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RemoteUser" type="tt:RemoteUser" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetRemoteUserResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetUsers">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetUsersResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="User" type="tt:User" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of the onvif users and following information is included in each entry: username and user level.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="CreateUsers">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="User" type="tt:User" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Creates new device users and corresponding credentials. Each user entry includes: username, password and user level. Either all users are created successfully or a fault message MUST be returned without creating any user. If trying to create several users with exactly the same username the request is rejected and no users are created. If password is missing, then fault message Too weak password is returned.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CreateUsersResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="DeleteUsers">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Username" type="xs:string" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Deletes users on an device and there may exist users that cannot be deleted to ensure access to the unit. Either all users are deleted successfully or a fault message MUST be returned and no users be deleted. If a username exists multiple times in the request, then a fault message is returned.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="DeleteUsersResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetUser">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="User" type="tt:User" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Updates the credentials for one or several users on an device. Either all change requests are processed successfully or a fault message MUST be returned. If the request contains the same username multiple times, a fault message is returned. </xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetUserResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetWsdlUrl">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetWsdlUrlResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="WsdlUrl" type="xs:anyURI"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCapabilities">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Category" type="tt:CapabilityCategory" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									List of categories to retrieve capability information on.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCapabilitiesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Capabilities" type="tt:Capabilities">
-							<xs:annotation>
-								<xs:documentation>
-									Capability information.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetHostname">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetHostnameResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="HostnameInformation" type="tt:HostnameInformation">
-							<xs:annotation>
-								<xs:documentation>Contains the hostname information.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetHostname">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Name" type="xs:token">
-							<xs:annotation>
-								<xs:documentation>The hostname to set.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetHostnameResponse">
-				<xs:complexType>
-					<xs:sequence>
-				    </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetHostnameFromDHCP">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="FromDHCP" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>True if the hostname shall be obtained via DHCP.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetHostnameFromDHCPResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RebootNeeded" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>
-									Indicates whether or not a reboot is required after configuration updates.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetDNS">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDNSResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="DNSInformation" type="tt:DNSInformation">
-							<xs:annotation>
-								<xs:documentation>
-									DNS information.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetDNS">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="FromDHCP" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>
-									Indicate if the DNS address is to be retrieved using DHCP.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="SearchDomain" type="xs:token" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									DNS search domain.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="DNSManual" type="tt:IPAddress" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									DNS address(es) set manually.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetDNSResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetNTP">
-				<xs:complexType>
-					<xs:sequence>
-				    </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetNTPResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NTPInformation" type="tt:NTPInformation">
-							<xs:annotation>
-								<xs:documentation>
-									NTP information.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetNTP">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="FromDHCP" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>
-									Indicate if NTP address information is to be retrieved using DHCP.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="NTPManual" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									Manual NTP settings.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetNTPResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetDynamicDNS">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDynamicDNSResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="DynamicDNSInformation" type="tt:DynamicDNSInformation">
-							<xs:annotation>
-								<xs:documentation>
-									Dynamic DNS information.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetDynamicDNS">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Type" type="tt:DynamicDNSType">
-							<xs:annotation>
-								<xs:documentation>
-									Dynamic DNS type.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Name" type="tt:DNSName" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>
-									DNS name.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="TTL" type="xs:duration" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>
-									DNS record time to live.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetDynamicDNSResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetNetworkInterfaces">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetNetworkInterfacesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NetworkInterfaces" type="tt:NetworkInterface" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									List of network interfaces.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetNetworkInterfaces">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="InterfaceToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>
-									Symbolic network interface name.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="NetworkInterface" type="tt:NetworkInterfaceSetConfiguration">
-							<xs:annotation>
-								<xs:documentation>
-									Network interface name.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetNetworkInterfacesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RebootNeeded" type="xs:boolean" minOccurs="1" maxOccurs="1">
-							<xs:annotation>
-								<xs:documentation>
-									Indicates whether or not a reboot is required after configuration updates.
-									If a device responds with RebootNeeded set to false, the device can be reached
-									via the new IP address without further action. A client should be aware that a device
-									may not be responsive for a short period of time until it signals availability at
-									the new address via the discovery Hello messages.
-									If a device responds with RebootNeeded set to true, it will be further available under
-									its previous IP address. The settings will only be activated when the device is
-									rebooted via the SystemReboot command.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetNetworkProtocols">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetNetworkProtocolsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NetworkProtocols" type="tt:NetworkProtocol" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains an array of defined protocols supported by the device. There are three protocols defined; HTTP, HTTPS and RTSP. The following parameters can be retrieved for each protocol: port and enable/disable.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetNetworkProtocols">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NetworkProtocols" type="tt:NetworkProtocol" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Configures one or more defined network protocols supported by the device. There are currently three protocols defined; HTTP, HTTPS and RTSP. The following parameters can be set for each protocol: port and enable/disable.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetNetworkProtocolsResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetNetworkDefaultGateway">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetNetworkDefaultGatewayResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NetworkGateway" type="tt:NetworkGateway">
-							<xs:annotation>
-								<xs:documentation>Gets the default IPv4 and IPv6 gateway settings from the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetNetworkDefaultGateway">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Sets IPv4 gateway address used as default setting.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Sets IPv6 gateway address used as default setting.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetNetworkDefaultGatewayResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetZeroConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetZeroConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ZeroConfiguration" type="tt:NetworkZeroConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the zero-configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetZeroConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="InterfaceToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Unique identifier referencing the physical interface.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Enabled" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>Specifies if the zero-configuration should be enabled or not.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetZeroConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetIPAddressFilter">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetIPAddressFilterResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="IPAddressFilter" type="tt:IPAddressFilter"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetIPAddressFilter">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="IPAddressFilter" type="tt:IPAddressFilter"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetIPAddressFilterResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddIPAddressFilter">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="IPAddressFilter" type="tt:IPAddressFilter"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddIPAddressFilterResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveIPAddressFilter">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="IPAddressFilter" type="tt:IPAddressFilter"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveIPAddressFilterResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAccessPolicy">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAccessPolicyResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PolicyFile" type="tt:BinaryData"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetAccessPolicy">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PolicyFile" type="tt:BinaryData"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetAccessPolicyResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="CreateCertificate">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CertificateID" type="xs:token" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Certificate id.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Subject" type="xs:string" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Identification of the entity associated with the public-key.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ValidNotBefore" type="xs:dateTime" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Certificate validity start date.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ValidNotAfter" type="xs:dateTime" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Certificate expiry start date.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CreateCertificateResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NvtCertificate" type="tt:Certificate">
-							<xs:annotation>
-								<xs:documentation>
-									base64 encoded DER representation of certificate.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCertificates">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCertificatesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NvtCertificate" type="tt:Certificate" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									Id and base64 encoded DER representation of all available certificates.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCertificatesStatus">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCertificatesStatusResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CertificateStatus" type="tt:CertificateStatus" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									Indicates if a certificate is used in an optional HTTPS configuration of the device.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetCertificatesStatus">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CertificateStatus" type="tt:CertificateStatus" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									Indicates if a certificate is to be used in an optional HTTPS configuration of the device.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetCertificatesStatusResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="DeleteCertificates">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CertificateID" type="xs:token" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									List of ids of certificates to delete.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="DeleteCertificatesResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetPkcs10Request">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CertificateID" type="xs:token">
-							<xs:annotation>
-								<xs:documentation>
-									List of ids of certificates to delete.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Subject" type="xs:string" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>
-									Relative Dinstinguished Name(RDN) CommonName(CN).
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Attributes" type="tt:BinaryData" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>
-									Optional base64 encoded DER attributes.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetPkcs10RequestResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Pkcs10Request" type="tt:BinaryData">
-							<xs:annotation>
-								<xs:documentation>
-									base64 encoded DER representation of certificate.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="LoadCertificates">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NVTCertificate" type="tt:Certificate" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									Optional id and base64 encoded DER representation of certificate.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="LoadCertificatesResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetClientCertificateMode">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetClientCertificateModeResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Enabled" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>
-									Indicates whether or not client certificates are required by device.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetClientCertificateMode">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Enabled" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>
-									Indicates whether or not client certificates are required by device.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetClientCertificateModeResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCACertificates">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCACertificatesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CACertificate" type="tt:Certificate" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="LoadCertificateWithPrivateKey">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CertificateWithPrivateKey" type="tt:CertificateWithPrivateKey" minOccurs="1" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="LoadCertificateWithPrivateKeyResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCertificateInformation">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CertificateID" type="xs:token" minOccurs="1" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCertificateInformationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CertificateInformation" type="tt:CertificateInformation" minOccurs="1" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="LoadCACertificates">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CACertificate" type="tt:Certificate" minOccurs="1" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="LoadCACertificatesResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="CreateDot1XConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Dot1XConfiguration" type="tt:Dot1XConfiguration" minOccurs="1" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CreateDot1XConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetDot1XConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Dot1XConfiguration" type="tt:Dot1XConfiguration" minOccurs="1" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetDot1XConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetDot1XConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Dot1XConfigurationToken" type="tt:ReferenceToken" minOccurs="1" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDot1XConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Dot1XConfiguration" type="tt:Dot1XConfiguration" minOccurs="1" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetDot1XConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-			</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDot1XConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Dot1XConfiguration" type="tt:Dot1XConfiguration" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="DeleteDot1XConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Dot1XConfigurationToken" type="tt:ReferenceToken" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="DeleteDot1XConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetRelayOutputs">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetRelayOutputsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RelayOutputs" type="tt:RelayOutput" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetRelayOutputSettings">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RelayOutputToken" type="tt:ReferenceToken"/>
-						<xs:element name="Properties" type="tt:RelayOutputSettings"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetRelayOutputSettingsResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetRelayOutputState">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RelayOutputToken" type="tt:ReferenceToken" minOccurs="1" maxOccurs="1"/>
-						<xs:element name="LogicalState" type="tt:RelayLogicalState" minOccurs="1" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetRelayOutputStateResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SendAuxiliaryCommand">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="AuxiliaryCommand" type="tt:AuxiliaryData" minOccurs="1" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SendAuxiliaryCommandResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="AuxiliaryCommandResponse" type="tt:AuxiliaryData" minOccurs="0" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetDot11Capabilities">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDot11CapabilitiesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Capabilities" type="tt:Dot11Capabilities"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetDot11Status">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="InterfaceToken" type="tt:ReferenceToken"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDot11StatusResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Status" type="tt:Dot11Status"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="ScanAvailableDot11Networks">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="InterfaceToken" type="tt:ReferenceToken"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ScanAvailableDot11NetworksResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Networks" type="tt:Dot11AvailableNetworks" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetSystemUris">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetSystemUrisResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="SystemLogUris" type="tt:SystemLogUriList" minOccurs="0" maxOccurs="1"/>
-						<xs:element name="SupportInfoUri" type="xs:anyURI" minOccurs="0" maxOccurs="1"/>
-						<xs:element name="SystemBackupUri" type="xs:anyURI" minOccurs="0" maxOccurs="1"/>
-						<xs:element name="Extension" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="StartFirmwareUpgrade">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="StartFirmwareUpgradeResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="UploadUri" type="xs:anyURI"/>
-						<xs:element name="UploadDelay" type="xs:duration"/>
-						<xs:element name="ExpectedDownTime" type="xs:duration"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="StartSystemRestore">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="StartSystemRestoreResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="UploadUri" type="xs:anyURI"/>
-						<xs:element name="ExpectedDownTime" type="xs:duration"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			
-			<xs:complexType name="UserCredential">
-				<xs:sequence>
-					<xs:element name="UserName" type="xs:string">
-						<xs:annotation>	
-							<xs:documentation>User name</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Password" type="xs:string" minOccurs="0">
-						<xs:annotation>	
-							<xs:documentation> optional password</xs:documentation> 
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-			
-			<xs:simpleType name="StorageType">
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="NFS">
-						<xs:annotation>	
-							<xs:documentation>NFS protocol</xs:documentation>
-						</xs:annotation>
-					</xs:enumeration>
-					<xs:enumeration value="CIFS">
-						<xs:annotation>
-							<xs:documentation>CIFS protocol</xs:documentation>
-						</xs:annotation>
-					</xs:enumeration>
-					<xs:enumeration value="CDMI">
-						<xs:annotation>
-							<xs:documentation>CDMI protocol</xs:documentation>
-						</xs:annotation>
-					</xs:enumeration>
-				</xs:restriction>
-			</xs:simpleType>
-			
-			<xs:complexType name="StorageConfigurationData">
-				<xs:sequence>
-					<xs:element name="LocalPath" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-			  				<xs:documentation> local path </xs:documentation>
-			  			</xs:annotation>
-					</xs:element>
-					<xs:element name="StorageUri" type="xs:anyURI" minOccurs="0">
-			  			<xs:annotation>
-			  				<xs:documentation> Storage server address </xs:documentation>
-			  			</xs:annotation>
-			  		</xs:element>
-					<xs:element name="User" type="tds:UserCredential"  minOccurs="0">
-			  			<xs:annotation>
-			  				<xs:documentation> User credential for the storage server </xs:documentation>
-			  			</xs:annotation>
-			  		</xs:element>
-					<xs:element name="Extension" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-				<xs:attribute name="type" type="xs:string" use="required">
-					<xs:annotation>
-						<xs:documentation>StorageType lists the acceptable values for type attribute </xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			 </xs:complexType>
-
-			<xs:complexType name="StorageConfiguration">
-				<xs:complexContent>
-					<xs:extension base="tt:DeviceEntity">
-						<xs:sequence>
-							<xs:element name="Data" type="tds:StorageConfigurationData">
-							</xs:element>
-						</xs:sequence>
-					</xs:extension>
-				</xs:complexContent>
-			</xs:complexType>
-
-			<!--===============================-->
-			<!--===============================-->
-			<xs:element name="GetStorageConfigurations">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetStorageConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="StorageConfigurations" type="tds:StorageConfiguration" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>			
-			<!--===============================-->
-			<!--===============================-->
- 			<xs:element name="CreateStorageConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="StorageConfiguration" type="tds:StorageConfigurationData">
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>			
-			<xs:element name="CreateStorageConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Token" type="tt:ReferenceToken">
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>	 		
-			<!--===============================-->
-			<!--===============================-->
- 			<xs:element name="GetStorageConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Token" type="tt:ReferenceToken">
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>			
-			<xs:element name="GetStorageConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="StorageConfiguration" type="tds:StorageConfiguration">
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>	 		
-			<!--===============================-->
-			<!--===============================-->
- 			<xs:element name="SetStorageConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="StorageConfiguration" type="tds:StorageConfiguration">
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>			
-			<xs:element name="SetStorageConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>	 		
-			<!--===============================-->
-			<!--===============================-->
- 			<xs:element name="DeleteStorageConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Token" type="tt:ReferenceToken">
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>			
-			<xs:element name="DeleteStorageConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>	 		
-			<!--===============================-->
-			<xs:element name="GetGeoLocation">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>			
-			<xs:element name="GetGeoLocationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Location" type="tt:LocationEntity" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>	 		
-			<!--===============================-->
-			<xs:element name="SetGeoLocation">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Location" type="tt:LocationEntity" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>			
-			<xs:element name="SetGeoLocationResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>	 		
-			<!--===============================-->
-			<xs:element name="DeleteGeoLocation">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Location" type="tt:LocationEntity" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>			
-			<xs:element name="DeleteGeoLocationResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>	 		
-			<!--===============================-->
-			<!--===============================-->
-		</xs:schema>
-	</wsdl:types>
-	<wsdl:message name="GetServicesRequest">
-		<wsdl:part name="parameters" element="tds:GetServices"/>
-	</wsdl:message>
-	<wsdl:message name="GetServicesResponse">
-		<wsdl:part name="parameters" element="tds:GetServicesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetServiceCapabilitiesRequest">
-		<wsdl:part name="parameters" element="tds:GetServiceCapabilities"/>
-	</wsdl:message>
-	<wsdl:message name="GetServiceCapabilitiesResponse">
-		<wsdl:part name="parameters" element="tds:GetServiceCapabilitiesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDeviceInformationRequest">
-		<wsdl:part name="parameters" element="tds:GetDeviceInformation"/>
-	</wsdl:message>
-	<wsdl:message name="GetDeviceInformationResponse">
-		<wsdl:part name="parameters" element="tds:GetDeviceInformationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetSystemDateAndTimeRequest">
-		<wsdl:part name="parameters" element="tds:SetSystemDateAndTime"/>
-	</wsdl:message>
-	<wsdl:message name="SetSystemDateAndTimeResponse">
-		<wsdl:part name="parameters" element="tds:SetSystemDateAndTimeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemDateAndTimeRequest">
-		<wsdl:part name="parameters" element="tds:GetSystemDateAndTime"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemDateAndTimeResponse">
-		<wsdl:part name="parameters" element="tds:GetSystemDateAndTimeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetSystemFactoryDefaultRequest">
-		<wsdl:part name="parameters" element="tds:SetSystemFactoryDefault"/>
-	</wsdl:message>
-	<wsdl:message name="SetSystemFactoryDefaultResponse">
-		<wsdl:part name="parameters" element="tds:SetSystemFactoryDefaultResponse"/>
-	</wsdl:message>
-	<wsdl:message name="UpgradeSystemFirmwareRequest">
-		<wsdl:part name="parameters" element="tds:UpgradeSystemFirmware"/>
-	</wsdl:message>
-	<wsdl:message name="UpgradeSystemFirmwareResponse">
-		<wsdl:part name="parameters" element="tds:UpgradeSystemFirmwareResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SystemRebootRequest">
-		<wsdl:part name="parameters" element="tds:SystemReboot"/>
-	</wsdl:message>
-	<wsdl:message name="SystemRebootResponse">
-		<wsdl:part name="parameters" element="tds:SystemRebootResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemBackupRequest">
-		<wsdl:part name="parameters" element="tds:GetSystemBackup"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemBackupResponse">
-		<wsdl:part name="parameters" element="tds:GetSystemBackupResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RestoreSystemRequest">
-		<wsdl:part name="parameters" element="tds:RestoreSystem"/>
-	</wsdl:message>
-	<wsdl:message name="RestoreSystemResponse">
-		<wsdl:part name="parameters" element="tds:RestoreSystemResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemSupportInformationRequest">
-		<wsdl:part name="parameters" element="tds:GetSystemSupportInformation"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemSupportInformationResponse">
-		<wsdl:part name="parameters" element="tds:GetSystemSupportInformationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemLogRequest">
-		<wsdl:part name="parameters" element="tds:GetSystemLog"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemLogResponse">
-		<wsdl:part name="parameters" element="tds:GetSystemLogResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetScopesRequest">
-		<wsdl:part name="parameters" element="tds:GetScopes"/>
-	</wsdl:message>
-	<wsdl:message name="GetScopesResponse">
-		<wsdl:part name="parameters" element="tds:GetScopesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetScopesRequest">
-		<wsdl:part name="parameters" element="tds:SetScopes"/>
-	</wsdl:message>
-	<wsdl:message name="SetScopesResponse">
-		<wsdl:part name="parameters" element="tds:SetScopesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddScopesRequest">
-		<wsdl:part name="parameters" element="tds:AddScopes"/>
-	</wsdl:message>
-	<wsdl:message name="AddScopesResponse">
-		<wsdl:part name="parameters" element="tds:AddScopesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveScopesRequest">
-		<wsdl:part name="parameters" element="tds:RemoveScopes"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveScopesResponse">
-		<wsdl:part name="parameters" element="tds:RemoveScopesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDiscoveryModeRequest">
-		<wsdl:part name="parameters" element="tds:GetDiscoveryMode"/>
-	</wsdl:message>
-	<wsdl:message name="GetDiscoveryModeResponse">
-		<wsdl:part name="parameters" element="tds:GetDiscoveryModeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetDiscoveryModeRequest">
-		<wsdl:part name="parameters" element="tds:SetDiscoveryMode"/>
-	</wsdl:message>
-	<wsdl:message name="SetDiscoveryModeResponse">
-		<wsdl:part name="parameters" element="tds:SetDiscoveryModeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetRemoteDiscoveryModeRequest">
-		<wsdl:part name="parameters" element="tds:GetRemoteDiscoveryMode"/>
-	</wsdl:message>
-	<wsdl:message name="GetRemoteDiscoveryModeResponse">
-		<wsdl:part name="parameters" element="tds:GetRemoteDiscoveryModeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetRemoteDiscoveryModeRequest">
-		<wsdl:part name="parameters" element="tds:SetRemoteDiscoveryMode"/>
-	</wsdl:message>
-	<wsdl:message name="SetRemoteDiscoveryModeResponse">
-		<wsdl:part name="parameters" element="tds:SetRemoteDiscoveryModeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDPAddressesRequest">
-		<wsdl:part name="parameters" element="tds:GetDPAddresses"/>
-	</wsdl:message>
-	<wsdl:message name="GetDPAddressesResponse">
-		<wsdl:part name="parameters" element="tds:GetDPAddressesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetDPAddressesRequest">
-		<wsdl:part name="parameters" element="tds:SetDPAddresses"/>
-	</wsdl:message>
-	<wsdl:message name="SetDPAddressesResponse">
-		<wsdl:part name="parameters" element="tds:SetDPAddressesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetEndpointReferenceRequest">
-		<wsdl:part name="parameters" element="tds:GetEndpointReference"/>
-	</wsdl:message>
-	<wsdl:message name="GetEndpointReferenceResponse">
-		<wsdl:part name="parameters" element="tds:GetEndpointReferenceResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetRemoteUserRequest">
-		<wsdl:part name="parameters" element="tds:GetRemoteUser"/>
-	</wsdl:message>
-	<wsdl:message name="GetRemoteUserResponse">
-		<wsdl:part name="parameters" element="tds:GetRemoteUserResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetRemoteUserRequest">
-		<wsdl:part name="parameters" element="tds:SetRemoteUser"/>
-	</wsdl:message>
-	<wsdl:message name="SetRemoteUserResponse">
-		<wsdl:part name="parameters" element="tds:SetRemoteUserResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetUsersRequest">
-		<wsdl:part name="parameters" element="tds:GetUsers"/>
-	</wsdl:message>
-	<wsdl:message name="GetUsersResponse">
-		<wsdl:part name="parameters" element="tds:GetUsersResponse"/>
-	</wsdl:message>
-	<wsdl:message name="CreateUsersRequest">
-		<wsdl:part name="parameters" element="tds:CreateUsers"/>
-	</wsdl:message>
-	<wsdl:message name="CreateUsersResponse">
-		<wsdl:part name="parameters" element="tds:CreateUsersResponse"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteUsersRequest">
-		<wsdl:part name="parameters" element="tds:DeleteUsers"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteUsersResponse">
-		<wsdl:part name="parameters" element="tds:DeleteUsersResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetUserRequest">
-		<wsdl:part name="parameters" element="tds:SetUser"/>
-	</wsdl:message>
-	<wsdl:message name="SetUserResponse">
-		<wsdl:part name="parameters" element="tds:SetUserResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetWsdlUrlRequest">
-		<wsdl:part name="parameters" element="tds:GetWsdlUrl"/>
-	</wsdl:message>
-	<wsdl:message name="GetWsdlUrlResponse">
-		<wsdl:part name="parameters" element="tds:GetWsdlUrlResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCapabilitiesRequest">
-		<wsdl:part name="parameters" element="tds:GetCapabilities"/>
-	</wsdl:message>
-	<wsdl:message name="GetCapabilitiesResponse">
-		<wsdl:part name="parameters" element="tds:GetCapabilitiesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetHostnameRequest">
-		<wsdl:part name="parameters" element="tds:GetHostname"/>
-	</wsdl:message>
-	<wsdl:message name="GetHostnameResponse">
-		<wsdl:part name="parameters" element="tds:GetHostnameResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetHostnameRequest">
-		<wsdl:part name="parameters" element="tds:SetHostname"/>
-	</wsdl:message>
-	<wsdl:message name="SetHostnameResponse">
-		<wsdl:part name="parameters" element="tds:SetHostnameResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetHostnameFromDHCPRequest">
-		<wsdl:part name="parameters" element="tds:SetHostnameFromDHCP"/>
-	</wsdl:message>
-	<wsdl:message name="SetHostnameFromDHCPResponse">
-		<wsdl:part name="parameters" element="tds:SetHostnameFromDHCPResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDNSRequest">
-		<wsdl:part name="parameters" element="tds:GetDNS"/>
-	</wsdl:message>
-	<wsdl:message name="GetDNSResponse">
-		<wsdl:part name="parameters" element="tds:GetDNSResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetDNSRequest">
-		<wsdl:part name="parameters" element="tds:SetDNS"/>
-	</wsdl:message>
-	<wsdl:message name="SetDNSResponse">
-		<wsdl:part name="parameters" element="tds:SetDNSResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetNTPRequest">
-		<wsdl:part name="parameters" element="tds:GetNTP"/>
-	</wsdl:message>
-	<wsdl:message name="GetNTPResponse">
-		<wsdl:part name="parameters" element="tds:GetNTPResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetNTPRequest">
-		<wsdl:part name="parameters" element="tds:SetNTP"/>
-	</wsdl:message>
-	<wsdl:message name="SetNTPResponse">
-		<wsdl:part name="parameters" element="tds:SetNTPResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDynamicDNSRequest">
-		<wsdl:part name="parameters" element="tds:GetDynamicDNS"/>
-	</wsdl:message>
-	<wsdl:message name="GetDynamicDNSResponse">
-		<wsdl:part name="parameters" element="tds:GetDynamicDNSResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetDynamicDNSRequest">
-		<wsdl:part name="parameters" element="tds:SetDynamicDNS"/>
-	</wsdl:message>
-	<wsdl:message name="SetDynamicDNSResponse">
-		<wsdl:part name="parameters" element="tds:SetDynamicDNSResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetNetworkInterfacesRequest">
-		<wsdl:part name="parameters" element="tds:GetNetworkInterfaces"/>
-	</wsdl:message>
-	<wsdl:message name="GetNetworkInterfacesResponse">
-		<wsdl:part name="parameters" element="tds:GetNetworkInterfacesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetNetworkInterfacesRequest">
-		<wsdl:part name="parameters" element="tds:SetNetworkInterfaces"/>
-	</wsdl:message>
-	<wsdl:message name="SetNetworkInterfacesResponse">
-		<wsdl:part name="parameters" element="tds:SetNetworkInterfacesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetNetworkProtocolsRequest">
-		<wsdl:part name="parameters" element="tds:GetNetworkProtocols"/>
-	</wsdl:message>
-	<wsdl:message name="GetNetworkProtocolsResponse">
-		<wsdl:part name="parameters" element="tds:GetNetworkProtocolsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetNetworkProtocolsRequest">
-		<wsdl:part name="parameters" element="tds:SetNetworkProtocols"/>
-	</wsdl:message>
-	<wsdl:message name="SetNetworkProtocolsResponse">
-		<wsdl:part name="parameters" element="tds:SetNetworkProtocolsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetNetworkDefaultGatewayRequest">
-		<wsdl:part name="parameters" element="tds:GetNetworkDefaultGateway"/>
-	</wsdl:message>
-	<wsdl:message name="GetNetworkDefaultGatewayResponse">
-		<wsdl:part name="parameters" element="tds:GetNetworkDefaultGatewayResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetNetworkDefaultGatewayRequest">
-		<wsdl:part name="parameters" element="tds:SetNetworkDefaultGateway"/>
-	</wsdl:message>
-	<wsdl:message name="SetNetworkDefaultGatewayResponse">
-		<wsdl:part name="parameters" element="tds:SetNetworkDefaultGatewayResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetZeroConfigurationRequest">
-		<wsdl:part name="parameters" element="tds:GetZeroConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetZeroConfigurationResponse">
-		<wsdl:part name="parameters" element="tds:GetZeroConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetZeroConfigurationRequest">
-		<wsdl:part name="parameters" element="tds:SetZeroConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetZeroConfigurationResponse">
-		<wsdl:part name="parameters" element="tds:SetZeroConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetIPAddressFilterRequest">
-		<wsdl:part name="parameters" element="tds:GetIPAddressFilter"/>
-	</wsdl:message>
-	<wsdl:message name="GetIPAddressFilterResponse">
-		<wsdl:part name="parameters" element="tds:GetIPAddressFilterResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetIPAddressFilterRequest">
-		<wsdl:part name="parameters" element="tds:SetIPAddressFilter"/>
-	</wsdl:message>
-	<wsdl:message name="SetIPAddressFilterResponse">
-		<wsdl:part name="parameters" element="tds:SetIPAddressFilterResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddIPAddressFilterRequest">
-		<wsdl:part name="parameters" element="tds:AddIPAddressFilter"/>
-	</wsdl:message>
-	<wsdl:message name="AddIPAddressFilterResponse">
-		<wsdl:part name="parameters" element="tds:AddIPAddressFilterResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveIPAddressFilterRequest">
-		<wsdl:part name="parameters" element="tds:RemoveIPAddressFilter"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveIPAddressFilterResponse">
-		<wsdl:part name="parameters" element="tds:RemoveIPAddressFilterResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAccessPolicyRequest">
-		<wsdl:part name="parameters" element="tds:GetAccessPolicy"/>
-	</wsdl:message>
-	<wsdl:message name="GetAccessPolicyResponse">
-		<wsdl:part name="parameters" element="tds:GetAccessPolicyResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetAccessPolicyRequest">
-		<wsdl:part name="parameters" element="tds:SetAccessPolicy"/>
-	</wsdl:message>
-	<wsdl:message name="SetAccessPolicyResponse">
-		<wsdl:part name="parameters" element="tds:SetAccessPolicyResponse"/>
-	</wsdl:message>
-	<wsdl:message name="CreateCertificateRequest">
-		<wsdl:part name="parameters" element="tds:CreateCertificate"/>
-	</wsdl:message>
-	<wsdl:message name="CreateCertificateResponse">
-		<wsdl:part name="parameters" element="tds:CreateCertificateResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCertificatesRequest">
-		<wsdl:part name="parameters" element="tds:GetCertificates"/>
-	</wsdl:message>
-	<wsdl:message name="GetCertificatesResponse">
-		<wsdl:part name="parameters" element="tds:GetCertificatesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCertificatesStatusRequest">
-		<wsdl:part name="parameters" element="tds:GetCertificatesStatus"/>
-	</wsdl:message>
-	<wsdl:message name="GetCertificatesStatusResponse">
-		<wsdl:part name="parameters" element="tds:GetCertificatesStatusResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetCertificatesStatusRequest">
-		<wsdl:part name="parameters" element="tds:SetCertificatesStatus"/>
-	</wsdl:message>
-	<wsdl:message name="SetCertificatesStatusResponse">
-		<wsdl:part name="parameters" element="tds:SetCertificatesStatusResponse"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteCertificatesRequest">
-		<wsdl:part name="parameters" element="tds:DeleteCertificates"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteCertificatesResponse">
-		<wsdl:part name="parameters" element="tds:DeleteCertificatesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetPkcs10RequestRequest">
-		<wsdl:part name="parameters" element="tds:GetPkcs10Request"/>
-	</wsdl:message>
-	<wsdl:message name="GetPkcs10RequestResponse">
-		<wsdl:part name="parameters" element="tds:GetPkcs10RequestResponse"/>
-	</wsdl:message>
-	<wsdl:message name="LoadCertificatesRequest">
-		<wsdl:part name="parameters" element="tds:LoadCertificates"/>
-	</wsdl:message>
-	<wsdl:message name="LoadCertificatesResponse">
-		<wsdl:part name="parameters" element="tds:LoadCertificatesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetClientCertificateModeRequest">
-		<wsdl:part name="parameters" element="tds:GetClientCertificateMode"/>
-	</wsdl:message>
-	<wsdl:message name="GetClientCertificateModeResponse">
-		<wsdl:part name="parameters" element="tds:GetClientCertificateModeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetClientCertificateModeRequest">
-		<wsdl:part name="parameters" element="tds:SetClientCertificateMode"/>
-	</wsdl:message>
-	<wsdl:message name="SetClientCertificateModeResponse">
-		<wsdl:part name="parameters" element="tds:SetClientCertificateModeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetRelayOutputsRequest">
-		<wsdl:part name="parameters" element="tds:GetRelayOutputs"/>
-	</wsdl:message>
-	<wsdl:message name="GetRelayOutputsResponse">
-		<wsdl:part name="parameters" element="tds:GetRelayOutputsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetRelayOutputSettingsRequest">
-		<wsdl:part name="parameters" element="tds:SetRelayOutputSettings"/>
-	</wsdl:message>
-	<wsdl:message name="SetRelayOutputSettingsResponse">
-		<wsdl:part name="parameters" element="tds:SetRelayOutputSettingsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetRelayOutputStateRequest">
-		<wsdl:part name="parameters" element="tds:SetRelayOutputState"/>
-	</wsdl:message>
-	<wsdl:message name="SetRelayOutputStateResponse">
-		<wsdl:part name="parameters" element="tds:SetRelayOutputStateResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SendAuxiliaryCommandRequest">
-		<wsdl:part name="parameters" element="tds:SendAuxiliaryCommand"/>
-	</wsdl:message>
-	<wsdl:message name="SendAuxiliaryCommandResponse">
-		<wsdl:part name="parameters" element="tds:SendAuxiliaryCommandResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCACertificatesRequest">
-		<wsdl:part name="parameters" element="tds:GetCACertificates"/>
-	</wsdl:message>
-	<wsdl:message name="GetCACertificatesResponse">
-		<wsdl:part name="parameters" element="tds:GetCACertificatesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="LoadCertificateWithPrivateKeyRequest">
-		<wsdl:part name="parameters" element="tds:LoadCertificateWithPrivateKey"/>
-	</wsdl:message>
-	<wsdl:message name="LoadCertificateWithPrivateKeyResponse">
-		<wsdl:part name="parameters" element="tds:LoadCertificateWithPrivateKeyResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCertificateInformationRequest">
-		<wsdl:part name="parameters" element="tds:GetCertificateInformation"/>
-	</wsdl:message>
-	<wsdl:message name="GetCertificateInformationResponse">
-		<wsdl:part name="parameters" element="tds:GetCertificateInformationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="LoadCACertificatesRequest">
-		<wsdl:part name="parameters" element="tds:LoadCACertificates"/>
-	</wsdl:message>
-	<wsdl:message name="LoadCACertificatesResponse">
-		<wsdl:part name="parameters" element="tds:LoadCACertificatesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="CreateDot1XConfigurationRequest">
-		<wsdl:part name="parameters" element="tds:CreateDot1XConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="CreateDot1XConfigurationResponse">
-		<wsdl:part name="parameters" element="tds:CreateDot1XConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetDot1XConfigurationRequest">
-		<wsdl:part name="parameters" element="tds:SetDot1XConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetDot1XConfigurationResponse">
-		<wsdl:part name="parameters" element="tds:SetDot1XConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDot1XConfigurationRequest">
-		<wsdl:part name="parameters" element="tds:GetDot1XConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetDot1XConfigurationResponse">
-		<wsdl:part name="parameters" element="tds:GetDot1XConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDot1XConfigurationsRequest">
-		<wsdl:part name="parameters" element="tds:GetDot1XConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetDot1XConfigurationsResponse">
-		<wsdl:part name="parameters" element="tds:GetDot1XConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteDot1XConfigurationRequest">
-		<wsdl:part name="parameters" element="tds:DeleteDot1XConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteDot1XConfigurationResponse">
-		<wsdl:part name="parameters" element="tds:DeleteDot1XConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDot11CapabilitiesRequest">
-		<wsdl:part name="parameters" element="tds:GetDot11Capabilities"/>
-	</wsdl:message>
-	<wsdl:message name="GetDot11CapabilitiesResponse">
-		<wsdl:part name="parameters" element="tds:GetDot11CapabilitiesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDot11StatusRequest">
-		<wsdl:part name="parameters" element="tds:GetDot11Status"/>
-	</wsdl:message>
-	<wsdl:message name="GetDot11StatusResponse">
-		<wsdl:part name="parameters" element="tds:GetDot11StatusResponse"/>
-	</wsdl:message>
-	<wsdl:message name="ScanAvailableDot11NetworksRequest">
-		<wsdl:part name="parameters" element="tds:ScanAvailableDot11Networks"/>
-	</wsdl:message>
-	<wsdl:message name="ScanAvailableDot11NetworksResponse">
-		<wsdl:part name="parameters" element="tds:ScanAvailableDot11NetworksResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemUrisRequest">
-		<wsdl:part name="parameters" element="tds:GetSystemUris"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemUrisResponse">
-		<wsdl:part name="parameters" element="tds:GetSystemUrisResponse"/>
-	</wsdl:message>
-	<wsdl:message name="StartFirmwareUpgradeRequest">
-		<wsdl:part name="parameters" element="tds:StartFirmwareUpgrade"/>
-	</wsdl:message>
-	<wsdl:message name="StartFirmwareUpgradeResponse">
-		<wsdl:part name="parameters" element="tds:StartFirmwareUpgradeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="StartSystemRestoreRequest">
-		<wsdl:part name="parameters" element="tds:StartSystemRestore"/>
-	</wsdl:message>
-	<wsdl:message name="StartSystemRestoreResponse">
-		<wsdl:part name="parameters" element="tds:StartSystemRestoreResponse"/>
-	</wsdl:message>
-	
-	<wsdl:message name="GetStorageConfigurationsRequest">
-		<wsdl:part name="parameters" element="tds:GetStorageConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetStorageConfigurationsResponse">
-		<wsdl:part name="parameters" element="tds:GetStorageConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="CreateStorageConfigurationRequest">
-		<wsdl:part name="parameters" element="tds:CreateStorageConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="CreateStorageConfigurationResponse">
-		<wsdl:part name="parameters" element="tds:CreateStorageConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetStorageConfigurationRequest">
-		<wsdl:part name="parameters" element="tds:GetStorageConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetStorageConfigurationResponse">
-		<wsdl:part name="parameters" element="tds:GetStorageConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetStorageConfigurationRequest">
-		<wsdl:part name="parameters" element="tds:SetStorageConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetStorageConfigurationResponse">
-		<wsdl:part name="parameters" element="tds:SetStorageConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteStorageConfigurationRequest">
-		<wsdl:part name="parameters" element="tds:DeleteStorageConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteStorageConfigurationResponse">
-		<wsdl:part name="parameters" element="tds:DeleteStorageConfigurationResponse"/>
-	</wsdl:message>	
-	
-	<wsdl:message name="GetGeoLocationRequest">
-		<wsdl:part name="parameters" element="tds:GetGeoLocation"/>
-	</wsdl:message>
-	<wsdl:message name="GetGeoLocationResponse">
-		<wsdl:part name="parameters" element="tds:GetGeoLocationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetGeoLocationRequest">
-		<wsdl:part name="parameters" element="tds:SetGeoLocation"/>
-	</wsdl:message>
-	<wsdl:message name="SetGeoLocationResponse">
-		<wsdl:part name="parameters" element="tds:SetGeoLocationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteGeoLocationRequest">
-		<wsdl:part name="parameters" element="tds:DeleteGeoLocation"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteGeoLocationResponse">
-		<wsdl:part name="parameters" element="tds:DeleteGeoLocationResponse"/>
-	</wsdl:message>	
-	
-	<wsdl:portType name="Device">
-		<wsdl:operation name="GetServices">
-			<wsdl:documentation>Returns information about services on the device.</wsdl:documentation>
-			<wsdl:input message="tds:GetServicesRequest"/>
-			<wsdl:output message="tds:GetServicesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetServiceCapabilities">
-			<wsdl:documentation>Returns the capabilities of the device service. The result is returned in a typed answer.</wsdl:documentation>
-			<wsdl:input message="tds:GetServiceCapabilitiesRequest"/>
-			<wsdl:output message="tds:GetServiceCapabilitiesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDeviceInformation">
-			<wsdl:documentation>This operation gets basic device information from the device.</wsdl:documentation>
-			<wsdl:input message="tds:GetDeviceInformationRequest"/>
-			<wsdl:output message="tds:GetDeviceInformationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetSystemDateAndTime">
-			<wsdl:documentation>This operation sets the device system date and time. The device shall support the
-				configuration of the daylight saving setting and of the manual system date and time (if
-				applicable) or indication of NTP time (if applicable) through the SetSystemDateAndTime
-				command. <br/>
-				If system time and date are set manually, the client shall include UTCDateTime in the request.<br/>
-				A TimeZone token which is not formed according to the rules of IEEE 1003.1 section 8.3 is considered as invalid timezone.<br/>
-				The DayLightSavings flag should be set to true to activate any DST settings of the TimeZone string. 
-				Clear the DayLightSavings flag if the DST portion of the TimeZone settings should be ignored.
-			</wsdl:documentation>
-			<wsdl:input message="tds:SetSystemDateAndTimeRequest"/>
-			<wsdl:output message="tds:SetSystemDateAndTimeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemDateAndTime">
-			<wsdl:documentation>This operation gets the device system date and time. The device shall support the return of
-				the daylight saving setting and of the manual system date and time (if applicable) or indication
-				of NTP time (if applicable) through the GetSystemDateAndTime command.<br/>
-				A device shall provide the UTCDateTime information.</wsdl:documentation>
-			<wsdl:input message="tds:GetSystemDateAndTimeRequest"/>
-			<wsdl:output message="tds:GetSystemDateAndTimeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetSystemFactoryDefault">
-			<wsdl:documentation>This operation reloads the parameters on the device to their factory default values.</wsdl:documentation>
-			<wsdl:input message="tds:SetSystemFactoryDefaultRequest"/>
-			<wsdl:output message="tds:SetSystemFactoryDefaultResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="UpgradeSystemFirmware">
-			<wsdl:documentation>This operation upgrades a device firmware version. After a successful upgrade the response
-				message is sent before the device reboots. The device should support firmware upgrade
-				through the UpgradeSystemFirmware command. The exact format of the firmware data is
-				outside the scope of this standard.</wsdl:documentation>
-			<wsdl:input message="tds:UpgradeSystemFirmwareRequest"/>
-			<wsdl:output message="tds:UpgradeSystemFirmwareResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SystemReboot">
-			<wsdl:documentation>This operation reboots the device.</wsdl:documentation>
-			<wsdl:input message="tds:SystemRebootRequest"/>
-			<wsdl:output message="tds:SystemRebootResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RestoreSystem">
-			<wsdl:documentation>This operation restores the system backup configuration files(s) previously retrieved from a
-				device. The device should support restore of backup configuration file(s) through the
-				RestoreSystem command. The exact format of the backup configuration file(s) is outside the
-				scope of this standard. If the command is supported, it shall accept backup files returned by
-				the GetSystemBackup command.</wsdl:documentation>
-			<wsdl:input message="tds:RestoreSystemRequest"/>
-			<wsdl:output message="tds:RestoreSystemResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemBackup">
-			<wsdl:documentation>This operation is retrieves system backup configuration file(s) from a device. The device
-				should support return of back up configuration file(s) through the GetSystemBackup command.
-				The backup is returned with reference to a name and mime-type together with binary data.
-				The exact format of the backup configuration files is outside the scope of this standard.</wsdl:documentation>
-			<wsdl:input message="tds:GetSystemBackupRequest"/>
-			<wsdl:output message="tds:GetSystemBackupResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemLog">
-			<wsdl:documentation>This operation gets a system log from the device. The exact format of the system logs is outside the scope of this standard.</wsdl:documentation>
-			<wsdl:input message="tds:GetSystemLogRequest"/>
-			<wsdl:output message="tds:GetSystemLogResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemSupportInformation">
-			<wsdl:documentation>This operation gets arbitary device diagnostics information from the device.</wsdl:documentation>
-			<wsdl:input message="tds:GetSystemSupportInformationRequest"/>
-			<wsdl:output message="tds:GetSystemSupportInformationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetScopes">
-			<wsdl:documentation>This operation requests the scope parameters of a device. The scope parameters are used in
-				the device discovery to match a probe message, see Section 7. The Scope parameters are of
-				two different types: <ul>
-					<li>Fixed</li>
-					<li>Configurable</li>
-				</ul>
-				Fixed scope parameters are permanent device characteristics and cannot be removed through the device management interface. 
-				The scope type is indicated in the scope list returned in the get scope parameters response. A device shall support 
-				retrieval of discovery scope parameters through the GetScopes command. As some scope parameters are mandatory, 
-				the device shall return a non-empty scope list in the response.</wsdl:documentation>
-			<wsdl:input message="tds:GetScopesRequest"/>
-			<wsdl:output message="tds:GetScopesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetScopes">
-			<wsdl:documentation>This operation sets the scope parameters of a device. The scope parameters are used in the
-				device discovery to match a probe message.
-				This operation replaces all existing configurable scope parameters (not fixed parameters). If
-				this shall be avoided, one should use the scope add command instead. The device shall
-				support configuration of discovery scope parameters through the SetScopes command.</wsdl:documentation>
-			<wsdl:input message="tds:SetScopesRequest"/>
-			<wsdl:output message="tds:SetScopesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddScopes">
-			<wsdl:documentation>This operation adds new configurable scope parameters to a device. The scope parameters
-				are used in the device discovery to match a probe message. The device shall
-				support addition of discovery scope parameters through the AddScopes command.</wsdl:documentation>
-			<wsdl:input message="tds:AddScopesRequest"/>
-			<wsdl:output message="tds:AddScopesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveScopes">
-			<wsdl:documentation>This operation deletes scope-configurable scope parameters from a device. The scope
-				parameters are used in the device discovery to match a probe message, see Section 7. The
-				device shall support deletion of discovery scope parameters through the RemoveScopes
-				command.
-				Table</wsdl:documentation>
-			<wsdl:input message="tds:RemoveScopesRequest"/>
-			<wsdl:output message="tds:RemoveScopesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDiscoveryMode">
-			<wsdl:documentation>This operation gets the discovery mode of a device. See Section 7.2 for the definition of the
-				different device discovery modes. The device shall support retrieval of the discovery mode
-				setting through the GetDiscoveryMode command.</wsdl:documentation>
-			<wsdl:input message="tds:GetDiscoveryModeRequest"/>
-			<wsdl:output message="tds:GetDiscoveryModeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetDiscoveryMode">
-			<wsdl:documentation>This operation sets the discovery mode operation of a device. See Section 7.2 for the
-				definition of the different device discovery modes. The device shall support configuration of
-				the discovery mode setting through the SetDiscoveryMode command.</wsdl:documentation>
-			<wsdl:input message="tds:SetDiscoveryModeRequest"/>
-			<wsdl:output message="tds:SetDiscoveryModeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetRemoteDiscoveryMode">
-			<wsdl:documentation>This operation gets the remote discovery mode of a device. See Section 7.4 for the definition
-				of remote discovery extensions. A device that supports remote discovery shall support
-				retrieval of the remote discovery mode setting through the GetRemoteDiscoveryMode
-				command.</wsdl:documentation>
-			<wsdl:input message="tds:GetRemoteDiscoveryModeRequest"/>
-			<wsdl:output message="tds:GetRemoteDiscoveryModeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetRemoteDiscoveryMode">
-			<wsdl:documentation>This operation sets the remote discovery mode of operation of a device. See Section 7.4 for
-				the definition of remote discovery remote extensions. A device that supports remote discovery
-				shall support configuration of the discovery mode setting through the
-				SetRemoteDiscoveryMode command.</wsdl:documentation>
-			<wsdl:input message="tds:SetRemoteDiscoveryModeRequest"/>
-			<wsdl:output message="tds:SetRemoteDiscoveryModeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDPAddresses">
-			<wsdl:documentation>This operation gets the remote DP address or addresses from a device. If the device supports
-				remote discovery, as specified in Section 7.4, the device shall support retrieval of the remote
-				DP address(es) through the GetDPAddresses command.</wsdl:documentation>
-			<wsdl:input message="tds:GetDPAddressesRequest"/>
-			<wsdl:output message="tds:GetDPAddressesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetDPAddresses">
-			<wsdl:documentation>This operation sets the remote DP address or addresses on a device. If the device supports
-				remote discovery, as specified in Section 7.4, the device shall support configuration of the
-				remote DP address(es) through the SetDPAddresses command.</wsdl:documentation>
-			<wsdl:input message="tds:SetDPAddressesRequest"/>
-			<wsdl:output message="tds:SetDPAddressesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetEndpointReference">
-			<wsdl:documentation>A client can ask for the device service endpoint reference address property that can be used
-				to derive the password equivalent for remote user operation. The device shall support the
-				GetEndpointReference command returning the address property of the device service
-				endpoint reference.</wsdl:documentation>
-			<wsdl:input message="tds:GetEndpointReferenceRequest"/>
-			<wsdl:output message="tds:GetEndpointReferenceResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetRemoteUser">
-			<wsdl:documentation>This operation returns the configured remote user (if any). A device supporting remote user
-				handling shall support this operation. The user is only valid for the WS-UserToken profile or
-				as a HTTP / RTSP user.<br/>
-				The algorithm to use for deriving the password is described in section 5.12.2.1 of the core specification.</wsdl:documentation>
-			<wsdl:input message="tds:GetRemoteUserRequest"/>
-			<wsdl:output message="tds:GetRemoteUserResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetRemoteUser">
-			<wsdl:documentation>This operation sets the remote user. A device supporting remote user handling shall support this
-				operation. The user is only valid for the WS-UserToken profile or as a HTTP / RTSP user.<br/>
-				The password that is set shall always be the original (not derived) password.<br/>
-				If UseDerivedPassword is set password derivation shall be done by the device when connecting to a
-				remote device.The algorithm to use for deriving the password is described in section 5.12.2.1 of the core specification.<br/>
-				To remove the remote user SetRemoteUser should be called without the RemoteUser parameter.</wsdl:documentation>
-			<wsdl:input message="tds:SetRemoteUserRequest"/>
-			<wsdl:output message="tds:SetRemoteUserResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetUsers">
-			<wsdl:documentation>This operation lists the registered users and corresponding credentials on a device. The
-				device shall support retrieval of registered device users and their credentials for the user
-				token through the GetUsers command.</wsdl:documentation>
-			<wsdl:input message="tds:GetUsersRequest"/>
-			<wsdl:output message="tds:GetUsersResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="CreateUsers">
-			<wsdl:documentation>This operation creates new device users and corresponding credentials on a device for authentication purposes. 
-				The device shall support creation of device users and their credentials through the CreateUsers
-				command. Either all users are created successfully or a fault message shall be returned
-				without creating any user.<br/>
-				ONVIF compliant devices are recommended to support password length of at least 28 bytes,
-				as clients may follow the password derivation mechanism which results in 'password
-				equivalent' of length 28 bytes, as described in section 3.1.2 of the ONVIF security white paper.</wsdl:documentation>
-			<wsdl:input message="tds:CreateUsersRequest"/>
-			<wsdl:output message="tds:CreateUsersResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteUsers">
-			<wsdl:documentation>This operation deletes users on a device. The device shall support deletion of device users and their credentials 
-				through the DeleteUsers command. A device may have one or more fixed users
-				that cannot be deleted to ensure access to the unit. Either all users are deleted successfully or a
-				fault message shall be returned and no users be deleted.</wsdl:documentation>
-			<wsdl:input message="tds:DeleteUsersRequest"/>
-			<wsdl:output message="tds:DeleteUsersResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetUser">
-			<wsdl:documentation>This operation updates the settings for one or several users on a device for authentication purposes.
-				The device shall support update of device users and their credentials through the SetUser command. 
-				Either all change requests are processed successfully or a fault message shall be returned and no change requests be processed.</wsdl:documentation>
-			<wsdl:input message="tds:SetUserRequest"/>
-			<wsdl:output message="tds:SetUserResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetWsdlUrl">
-			<wsdl:documentation>It is possible for an endpoint to request a URL that can be used to retrieve the complete
-				schema and WSDL definitions of a device. The command gives in return a URL entry point
-				where all the necessary product specific WSDL and schema definitions can be retrieved. The
-				device shall provide a URL for WSDL and schema download through the GetWsdlUrl command.</wsdl:documentation>
-			<wsdl:input message="tds:GetWsdlUrlRequest"/>
-			<wsdl:output message="tds:GetWsdlUrlResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCapabilities">
-			<wsdl:documentation>Any endpoint can ask for the capabilities of a device using the capability exchange request
-				response operation. The device shall indicate all its ONVIF compliant capabilities through the
-				GetCapabilities command.
-				The capability list includes references to the addresses (XAddr) of the service implementing
-				the interface operations in the category. Apart from the addresses, the
-				capabilities only reflect optional functions.</wsdl:documentation>
-			<wsdl:input message="tds:GetCapabilitiesRequest"/>
-			<wsdl:output message="tds:GetCapabilitiesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetHostname">
-			<wsdl:documentation>This operation is used by an endpoint to get the hostname from a device. The device shall
-				return its hostname configurations through the GetHostname command.</wsdl:documentation>
-			<wsdl:input message="tds:GetHostnameRequest"/>
-			<wsdl:output message="tds:GetHostnameResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetHostname">
-			<wsdl:documentation>This operation sets the hostname on a device. It shall be possible to set the device hostname
-				configurations through the SetHostname command.<br/>
-				A device shall accept string formated according to RFC 1123 section 2.1 or alternatively to RFC 952, 
-				other string shall be considered as invalid strings. 
-			</wsdl:documentation>
-			<wsdl:input message="tds:SetHostnameRequest"/>
-			<wsdl:output message="tds:SetHostnameResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetHostnameFromDHCP">
-			<wsdl:documentation>This operation controls whether the hostname is set manually or retrieved via DHCP.</wsdl:documentation>
-			<wsdl:input message="tds:SetHostnameFromDHCPRequest"/>
-			<wsdl:output message="tds:SetHostnameFromDHCPResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDNS">
-			<wsdl:documentation>This operation gets the DNS settings from a device. The device shall return its DNS
-				configurations through the GetDNS command.</wsdl:documentation>
-			<wsdl:input message="tds:GetDNSRequest"/>
-			<wsdl:output message="tds:GetDNSResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetDNS">
-			<wsdl:documentation>This operation sets the DNS settings on a device. It shall be possible to set the device DNS
-				configurations through the SetDNS command.</wsdl:documentation>
-			<wsdl:input message="tds:SetDNSRequest"/>
-			<wsdl:output message="tds:SetDNSResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetNTP">
-			<wsdl:documentation>This operation gets the NTP settings from a device. If the device supports NTP, it shall be
-				possible to get the NTP server settings through the GetNTP command.</wsdl:documentation>
-			<wsdl:input message="tds:GetNTPRequest"/>
-			<wsdl:output message="tds:GetNTPResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetNTP">
-			<wsdl:documentation>This operation sets the NTP settings on a device. If the device supports NTP, it shall be
-				possible to set the NTP server settings through the SetNTP command.<br/>
-				A device shall accept string formated according to RFC 1123 section 2.1 or alternatively to RFC 952, 
-				other string shall be considered as invalid strings. <br/>
-				Changes to the NTP server list will not affect the clock mode DateTimeType. Use SetSystemDateAndTime to activate NTP operation.
-			</wsdl:documentation>
-			<wsdl:input message="tds:SetNTPRequest"/>
-			<wsdl:output message="tds:SetNTPResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDynamicDNS">
-			<wsdl:documentation>This operation gets the dynamic DNS settings from a device. If the device supports dynamic
-				DNS as specified in [RFC 2136] and [RFC 4702], it shall be possible to get the type, name
-				and TTL through the GetDynamicDNS command.</wsdl:documentation>
-			<wsdl:input message="tds:GetDynamicDNSRequest"/>
-			<wsdl:output message="tds:GetDynamicDNSResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetDynamicDNS">
-			<wsdl:documentation>This operation sets the dynamic DNS settings on a device. If the device supports dynamic
-				DNS as specified in [RFC 2136] and [RFC 4702], it shall be possible to set the type, name
-				and TTL through the SetDynamicDNS command.</wsdl:documentation>
-			<wsdl:input message="tds:SetDynamicDNSRequest"/>
-			<wsdl:output message="tds:SetDynamicDNSResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetNetworkInterfaces">
-			<wsdl:documentation>This operation gets the network interface configuration from a device. The device shall
-				support return of network interface configuration settings as defined by the NetworkInterface
-				type through the GetNetworkInterfaces command.</wsdl:documentation>
-			<wsdl:input message="tds:GetNetworkInterfacesRequest"/>
-			<wsdl:output message="tds:GetNetworkInterfacesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetNetworkInterfaces">
-			<wsdl:documentation>This operation sets the network interface configuration on a device. The device shall support
-				network configuration of supported network interfaces through the SetNetworkInterfaces
-				command.<br/>
-				For interoperability with a client unaware of the IEEE 802.11 extension a device shall retain
-				its IEEE 802.11 configuration if the IEEE 802.11 configuration element isn’t present in the
-				request.</wsdl:documentation>
-			<wsdl:input message="tds:SetNetworkInterfacesRequest"/>
-			<wsdl:output message="tds:SetNetworkInterfacesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetNetworkProtocols">
-			<wsdl:documentation>This operation gets defined network protocols from a device. The device shall support the
-				GetNetworkProtocols command returning configured network protocols.</wsdl:documentation>
-			<wsdl:input message="tds:GetNetworkProtocolsRequest"/>
-			<wsdl:output message="tds:GetNetworkProtocolsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetNetworkProtocols">
-			<wsdl:documentation>This operation configures defined network protocols on a device. The device shall support
-				configuration of defined network protocols through the SetNetworkProtocols command.</wsdl:documentation>
-			<wsdl:input message="tds:SetNetworkProtocolsRequest"/>
-			<wsdl:output message="tds:SetNetworkProtocolsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetNetworkDefaultGateway">
-			<wsdl:documentation>This operation gets the default gateway settings from a device. The device shall support the
-				GetNetworkDefaultGateway command returning configured default gateway address(es).</wsdl:documentation>
-			<wsdl:input message="tds:GetNetworkDefaultGatewayRequest"/>
-			<wsdl:output message="tds:GetNetworkDefaultGatewayResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetNetworkDefaultGateway">
-			<wsdl:documentation>This operation sets the default gateway settings on a device. The device shall support
-				configuration of default gateway through the SetNetworkDefaultGateway command.</wsdl:documentation>
-			<wsdl:input message="tds:SetNetworkDefaultGatewayRequest"/>
-			<wsdl:output message="tds:SetNetworkDefaultGatewayResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetZeroConfiguration">
-			<wsdl:documentation>This operation gets the zero-configuration from a device. If the device supports dynamic IP
-				configuration according to [RFC3927], it shall support the return of IPv4 zero configuration
-				address and status through the GetZeroConfiguration command.<br/>
-			Devices supporting zero configuration on more than one interface shall use the extension to list the additional interface settings.</wsdl:documentation>
-			<wsdl:input message="tds:GetZeroConfigurationRequest"/>
-			<wsdl:output message="tds:GetZeroConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetZeroConfiguration">
-			<wsdl:documentation>This operation sets the zero-configuration. Use GetCapalities to get if zero-zero-configuration is supported or not.</wsdl:documentation>
-			<wsdl:input message="tds:SetZeroConfigurationRequest"/>
-			<wsdl:output message="tds:SetZeroConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetIPAddressFilter">
-			<wsdl:documentation>This operation gets the IP address filter settings from a device. If the device supports device
-				access control based on IP filtering rules (denied or accepted ranges of IP addresses), the
-				device shall support the GetIPAddressFilter command.</wsdl:documentation>
-			<wsdl:input message="tds:GetIPAddressFilterRequest"/>
-			<wsdl:output message="tds:GetIPAddressFilterResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetIPAddressFilter">
-			<wsdl:documentation>This operation sets the IP address filter settings on a device. If the device supports device
-				access control based on IP filtering rules (denied or accepted ranges of IP addresses), the
-				device shall support configuration of IP filtering rules through the SetIPAddressFilter
-				command.</wsdl:documentation>
-			<wsdl:input message="tds:SetIPAddressFilterRequest"/>
-			<wsdl:output message="tds:SetIPAddressFilterResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddIPAddressFilter">
-			<wsdl:documentation>This operation adds an IP filter address to a device. If the device supports device access
-				control based on IP filtering rules (denied or accepted ranges of IP addresses), the device
-				shall support adding of IP filtering addresses through the AddIPAddressFilter command.</wsdl:documentation>
-			<wsdl:input message="tds:AddIPAddressFilterRequest"/>
-			<wsdl:output message="tds:AddIPAddressFilterResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveIPAddressFilter">
-			<wsdl:documentation>This operation deletes an IP filter address from a device. If the device supports device access
-				control based on IP filtering rules (denied or accepted ranges of IP addresses), the device
-				shall support deletion of IP filtering addresses through the RemoveIPAddressFilter command.</wsdl:documentation>
-			<wsdl:input message="tds:RemoveIPAddressFilterRequest"/>
-			<wsdl:output message="tds:RemoveIPAddressFilterResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAccessPolicy">
-			<wsdl:documentation>Access to different services and sub-sets of services should be subject to access control. The
-				WS-Security framework gives the prerequisite for end-point authentication. Authorization
-				decisions can then be taken using an access security policy. This standard does not mandate
-				any particular policy description format or security policy but this is up to the device
-				manufacturer or system provider to choose policy and policy description format of choice.
-				However, an access policy (in arbitrary format) can be requested using this command. If the
-				device supports access policy settings based on WS-Security authentication, then the device
-				shall support this command.</wsdl:documentation>
-			<wsdl:input message="tds:GetAccessPolicyRequest"/>
-			<wsdl:output message="tds:GetAccessPolicyResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetAccessPolicy">
-			<wsdl:documentation>This command sets the device access security policy (for more details on the access security
-				policy see the Get command). If the device supports access policy settings
-				based on WS-Security authentication, then the device shall support this command.</wsdl:documentation>
-			<wsdl:input message="tds:SetAccessPolicyRequest"/>
-			<wsdl:output message="tds:SetAccessPolicyResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="CreateCertificate">
-			<wsdl:documentation>This operation generates a private/public key pair and also can create a self-signed device
-				certificate as a result of key pair generation. The certificate is created using a suitable
-				onboard key pair generation mechanism.<br/>
-				If a device supports onboard key pair generation, the device that supports TLS shall support
-				this certificate creation command. And also, if a device supports onboard key pair generation,
-				the device that support IEEE 802.1X shall support this command for the purpose of key pair
-				generation. Certificates and key pairs are identified using certificate IDs. These IDs are either
-				chosen by the certificate generation requester or by the device (in case that no ID value is
-				given).</wsdl:documentation>
-			<wsdl:input message="tds:CreateCertificateRequest"/>
-			<wsdl:output message="tds:CreateCertificateResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCertificates">
-			<wsdl:documentation>This operation gets all device server certificates (including self-signed) for the purpose of TLS
-				authentication and all device client certificates for the purpose of IEEE 802.1X authentication.
-				This command lists only the TLS server certificates and IEEE 802.1X client certificates for the
-				device (neither trusted CA certificates nor trusted root certificates). The certificates are
-				returned as binary data. A device that supports TLS shall support this command and the
-				certificates shall be encoded using ASN.1 [X.681], [X.682], [X.683] DER [X.690] encoding
-				rules.</wsdl:documentation>
-			<wsdl:input message="tds:GetCertificatesRequest"/>
-			<wsdl:output message="tds:GetCertificatesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCertificatesStatus">
-			<wsdl:documentation>This operation is specific to TLS functionality. This operation gets the status
-				(enabled/disabled) of the device TLS server certificates. A device that supports TLS shall
-				support this command.</wsdl:documentation>
-			<wsdl:input message="tds:GetCertificatesStatusRequest"/>
-			<wsdl:output message="tds:GetCertificatesStatusResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetCertificatesStatus">
-			<wsdl:documentation>This operation is specific to TLS functionality. This operation sets the status (enable/disable)
-				of the device TLS server certificates. A device that supports TLS shall support this command.
-				Typically only one device server certificate is allowed to be enabled at a time.</wsdl:documentation>
-			<wsdl:input message="tds:SetCertificatesStatusRequest"/>
-			<wsdl:output message="tds:SetCertificatesStatusResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteCertificates">
-			<wsdl:documentation>This operation deletes a certificate or multiple certificates. The device MAY also delete a
-				private/public key pair which is coupled with the certificate to be deleted. The device that
-				support either TLS or IEEE 802.1X shall support the deletion of a certificate or multiple
-				certificates through this command. Either all certificates are deleted successfully or a fault
-				message shall be returned without deleting any certificate.</wsdl:documentation>
-			<wsdl:input message="tds:DeleteCertificatesRequest"/>
-			<wsdl:output message="tds:DeleteCertificatesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetPkcs10Request">
-			<wsdl:documentation>This operation requests a PKCS #10 certificate signature request from the device. The
-				returned information field shall be either formatted exactly as specified in [PKCS#10] or PEM
-				encoded [PKCS#10] format. In order for this command to work, the device must already have
-				a private/public key pair. This key pair should be referred by CertificateID as specified in the
-				input parameter description. This CertificateID refers to the key pair generated using
-				CreateCertificate command.<br/>
-				A device that support onboard key pair generation that supports either TLS or IEEE 802.1X
-				using client certificate shall support this command.</wsdl:documentation>
-			<wsdl:input message="tds:GetPkcs10RequestRequest"/>
-			<wsdl:output message="tds:GetPkcs10RequestResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="LoadCertificates">
-			<wsdl:documentation>TLS server certificate(s) or IEEE 802.1X client certificate(s) created using the PKCS#10
-				certificate request command can be loaded into the device using this command (see Section
-				8.4.13). The certificate ID in the request shall be present. The device may sort the received
-				certificate(s) based on the public key and subject information in the certificate(s).
-				The certificate ID in the request will be the ID value the client wish to have. The device is
-				supposed to scan the generated key pairs present in the device to identify which is the
-				correspondent key pair with the loaded certificate and then make the link between the
-				certificate and the key pair.<br/>
-				A device that supports onboard key pair generation that support either TLS or IEEE 802.1X
-				shall support this command.<br/>
-				The certificates shall be encoded using ASN.1 [X.681], [X.682], [X.683] DER [X.690] encoding
-				rules.<br/>
-				This command is applicable to any device type, although the parameter name is called for
-				historical reasons NVTCertificate.</wsdl:documentation>
-			<wsdl:input message="tds:LoadCertificatesRequest"/>
-			<wsdl:output message="tds:LoadCertificatesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetClientCertificateMode">
-			<wsdl:documentation>This operation is specific to TLS functionality. This operation gets the status
-				(enabled/disabled) of the device TLS client authentication. A device that supports TLS shall
-				support this command.</wsdl:documentation>
-			<wsdl:input message="tds:GetClientCertificateModeRequest"/>
-			<wsdl:output message="tds:GetClientCertificateModeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetClientCertificateMode">
-			<wsdl:documentation>This operation is specific to TLS functionality. This operation sets the status
-				(enabled/disabled) of the device TLS client authentication. A device that supports TLS shall
-				support this command.</wsdl:documentation>
-			<wsdl:input message="tds:SetClientCertificateModeRequest"/>
-			<wsdl:output message="tds:SetClientCertificateModeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetRelayOutputs">
-			<wsdl:documentation>This operation gets a list of all available relay outputs and their settings.<br/>
-				This method has been depricated with version 2.0. Refer to the DeviceIO service.</wsdl:documentation>
-			<wsdl:input message="tds:GetRelayOutputsRequest"/>
-			<wsdl:output message="tds:GetRelayOutputsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetRelayOutputSettings">
-			<wsdl:documentation>This operation sets the settings of a relay output.
-				<br/>This method has been depricated with version 2.0. Refer to the DeviceIO service.</wsdl:documentation>
-			<wsdl:input message="tds:SetRelayOutputSettingsRequest"/>
-			<wsdl:output message="tds:SetRelayOutputSettingsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetRelayOutputState">
-			<wsdl:documentation>This operation sets the state of a relay output.
-				<br/>This method has been depricated with version 2.0. Refer to the DeviceIO service.</wsdl:documentation>
-			<wsdl:input message="tds:SetRelayOutputStateRequest"/>
-			<wsdl:output message="tds:SetRelayOutputStateResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SendAuxiliaryCommand">
-			<wsdl:documentation>Manage auxiliary commands supported by a device, such as controlling an Infrared (IR) lamp, 
-				a heater or a wiper or a thermometer that is connected to the device.<br/>
-				The supported commands can be retrieved via the AuxiliaryCommands capability.<br/>
-				Although the name of the auxiliary commands can be freely defined, commands starting with the prefix tt: are 
-				reserved to define frequently used commands and these reserved commands shall all share the "tt:command|parameter" syntax.
-				<ul>
-					<li>tt:Wiper|On – Request to start the wiper.</li>
-					<li>tt:Wiper|Off – Request to stop the wiper.</li>
-					<li>tt:Washer|On – Request to start the washer.</li>
-					<li>tt:Washer|Off – Request to stop the washer.</li>
-					<li>tt:WashingProcedure|On – Request to start the washing procedure.</li>
-					<li>tt: WashingProcedure |Off – Request to stop the washing procedure.</li>
-					<li>tt:IRLamp|On – Request to turn ON an IR illuminator attached to the unit.</li>
-					<li>tt:IRLamp|Off – Request to turn OFF an IR illuminator attached to the unit.</li>
-					<li>tt:IRLamp|Auto – Request to configure an IR illuminator attached to the unit so that it automatically turns ON and OFF.</li>
-				</ul>
-				A device that indicates auxiliary service capability shall support this command.</wsdl:documentation>
-			<wsdl:input message="tds:SendAuxiliaryCommandRequest"/>
-			<wsdl:output message="tds:SendAuxiliaryCommandResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCACertificates">
-			<wsdl:documentation>CA certificates will be loaded into a device and be used for the sake of following two cases.
-				The one is for the purpose of TLS client authentication in TLS server function. The other one
-				is for the purpose of Authentication Server authentication in IEEE 802.1X function. This
-				operation gets all CA certificates loaded into a device. A device that supports either TLS client
-				authentication or IEEE 802.1X shall support this command and the returned certificates shall
-				be encoded using ASN.1 [X.681], [X.682], [X.683] DER [X.690] encoding rules.</wsdl:documentation>
-			<wsdl:input message="tds:GetCACertificatesRequest"/>
-			<wsdl:output message="tds:GetCACertificatesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="LoadCertificateWithPrivateKey">
-			<wsdl:documentation>There might be some cases that a Certificate Authority or some other equivalent creates a
-				certificate without having PKCS#10 certificate signing request. In such cases, the certificate
-				will be bundled in conjunction with its private key. This command will be used for such use
-				case scenarios. The certificate ID in the request is optionally set to the ID value the client
-				wish to have. If the certificate ID is not specified in the request, device can choose the ID
-				accordingly.<br/>
-				This operation imports a private/public key pair into the device.
-				The certificates shall be encoded using ASN.1 [X.681], [X.682], [X.683] DER [X.690] encoding
-				rules.<br/>
-				A device that does not support onboard key pair generation and support either TLS or IEEE
-				802.1X using client certificate shall support this command. A device that support onboard key
-				pair generation MAY support this command. The security policy of a device that supports this
-				operation should make sure that the private key is sufficiently protected.</wsdl:documentation>
-			<wsdl:input message="tds:LoadCertificateWithPrivateKeyRequest"/>
-			<wsdl:output message="tds:LoadCertificateWithPrivateKeyResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCertificateInformation">
-			<wsdl:documentation>This operation requests the information of a certificate specified by certificate ID. The device
-				should respond with its “Issuer DN”, “Subject DN”, “Key usage”, "Extended key usage”, “Key
-				Length”, “Version”, “Serial Number”, “Signature Algorithm” and “Validity” data as the
-				information of the certificate, as long as the device can retrieve such information from the
-				specified certificate.<br/>
-				A device that supports either TLS or IEEE 802.1X should support this command.</wsdl:documentation>
-			<wsdl:input message="tds:GetCertificateInformationRequest"/>
-			<wsdl:output message="tds:GetCertificateInformationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="LoadCACertificates">
-			<wsdl:documentation>This command is used when it is necessary to load trusted CA certificates or trusted root
-				certificates for the purpose of verification for its counterpart i.e. client certificate verification in
-				TLS function or server certificate verification in IEEE 802.1X function.<br/>
-				A device that support either TLS or IEEE 802.1X shall support this command. As for the
-				supported certificate format, either DER format or PEM format is possible to be used. But a
-				device that support this command shall support at least DER format as supported format type.
-				The device may sort the received certificate(s) based on the public key and subject
-				information in the certificate(s). Either all CA certificates are loaded successfully or a fault
-				message shall be returned without loading any CA certificate.</wsdl:documentation>
-			<wsdl:input message="tds:LoadCACertificatesRequest"/>
-			<wsdl:output message="tds:LoadCACertificatesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="CreateDot1XConfiguration">
-			<wsdl:documentation>This operation newly creates IEEE 802.1X configuration parameter set of the device. The
-				device shall support this command if it supports IEEE 802.1X. If the device receives this
-				request with already existing configuration token (Dot1XConfigurationToken) specification, the
-				device should respond with 'ter:ReferenceToken ' error to indicate there is some configuration
-				conflict.</wsdl:documentation>
-			<wsdl:input message="tds:CreateDot1XConfigurationRequest"/>
-			<wsdl:output message="tds:CreateDot1XConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetDot1XConfiguration">
-			<wsdl:documentation>While the CreateDot1XConfiguration command is trying to create a new configuration
-				parameter set, this operation modifies existing IEEE 802.1X configuration parameter set of
-				the device. A device that support IEEE 802.1X shall support this command.</wsdl:documentation>
-			<wsdl:input message="tds:SetDot1XConfigurationRequest"/>
-			<wsdl:output message="tds:SetDot1XConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDot1XConfiguration">
-			<wsdl:documentation>This operation gets one IEEE 802.1X configuration parameter set from the device by
-				specifying the configuration token (Dot1XConfigurationToken).<br/>
-				A device that supports IEEE 802.1X shall support this command.
-				Regardless of whether the 802.1X method in the retrieved configuration has a password or
-				not, the device shall not include the Password element in the response.</wsdl:documentation>
-			<wsdl:input message="tds:GetDot1XConfigurationRequest"/>
-			<wsdl:output message="tds:GetDot1XConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDot1XConfigurations">
-			<wsdl:documentation>This operation gets all the existing IEEE 802.1X configuration parameter sets from the device.
-				The device shall respond with all the IEEE 802.1X configurations so that the client can get to
-				know how many IEEE 802.1X configurations are existing and how they are configured.<br/>
-				A device that support IEEE 802.1X shall support this command.<br/>
-				Regardless of whether the 802.1X method in the retrieved configuration has a password or
-				not, the device shall not include the Password element in the response.</wsdl:documentation>
-			<wsdl:input message="tds:GetDot1XConfigurationsRequest"/>
-			<wsdl:output message="tds:GetDot1XConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteDot1XConfiguration">
-			<wsdl:documentation>This operation deletes an IEEE 802.1X configuration parameter set from the device. Which
-				configuration should be deleted is specified by the 'Dot1XConfigurationToken' in the request.
-				A device that support IEEE 802.1X shall support this command.</wsdl:documentation>
-			<wsdl:input message="tds:DeleteDot1XConfigurationRequest"/>
-			<wsdl:output message="tds:DeleteDot1XConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDot11Capabilities">
-			<wsdl:documentation>This operation returns the IEEE802.11 capabilities. The device shall support
-				this operation.</wsdl:documentation>
-			<wsdl:input message="tds:GetDot11CapabilitiesRequest"/>
-			<wsdl:output message="tds:GetDot11CapabilitiesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDot11Status">
-			<wsdl:documentation>This operation returns the status of a wireless network interface. The device shall support this
-				command.</wsdl:documentation>
-			<wsdl:input message="tds:GetDot11StatusRequest"/>
-			<wsdl:output message="tds:GetDot11StatusResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="ScanAvailableDot11Networks">
-			<wsdl:documentation>This operation returns a lists of the wireless networks in range of the device. A device should
-				support this operation.</wsdl:documentation>
-			<wsdl:input message="tds:ScanAvailableDot11NetworksRequest"/>
-			<wsdl:output message="tds:ScanAvailableDot11NetworksResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemUris">
-			<wsdl:documentation>This operation is used to retrieve URIs from which system information may be downloaded
-				using HTTP. URIs may be returned for the following system information:<br/>
-				System Logs. Multiple system logs may be returned, of different types. The exact format of
-				the system logs is outside the scope of this specification.<br/>
-				Support Information. This consists of arbitrary device diagnostics information from a device.
-				The exact format of the diagnostic information is outside the scope of this specification.<br/>
-				System Backup. The received file is a backup file that can be used to restore the current
-				device configuration at a later date. The exact format of the backup configuration file is
-				outside the scope of this specification.<br/>
-				If the device allows retrieval of system logs, support information or system backup data, it
-				should make them available via HTTP GET. If it does, it shall support the GetSystemUris
-				command.</wsdl:documentation>
-			<wsdl:input message="tds:GetSystemUrisRequest"/>
-			<wsdl:output message="tds:GetSystemUrisResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="StartFirmwareUpgrade">
-			<wsdl:documentation>This operation initiates a firmware upgrade using the HTTP POST mechanism. The response
-				to the command includes an HTTP URL to which the upgrade file may be uploaded. The
-				actual upgrade takes place as soon as the HTTP POST operation has completed. The device
-				should support firmware upgrade through the StartFirmwareUpgrade command. The exact
-				format of the firmware data is outside the scope of this specification.
-				Firmware upgrade over HTTP may be achieved using the following steps:<ol>
-					<li>Client calls StartFirmwareUpgrade.</li>
-					<li>Server responds with upload URI and optional delay value.</li>
-					<li>Client waits for delay duration if specified by server.</li>
-					<li>Client transmits the firmware image to the upload URI using HTTP POST.</li>
-					<li>Server reprograms itself using the uploaded image, then reboots.</li>
-				</ol>
-				If the firmware upgrade fails because the upgrade file was invalid, the HTTP POST response
-				shall be “415 Unsupported Media Type”. If the firmware upgrade fails due to an error at the
-				device, the HTTP POST response shall be “500 Internal Server Error”.<br/>
-				The value of the Content-Type header in the HTTP POST request shall be “application/octetstream”.</wsdl:documentation>
-			<wsdl:input message="tds:StartFirmwareUpgradeRequest"/>
-			<wsdl:output message="tds:StartFirmwareUpgradeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="StartSystemRestore">
-			<wsdl:documentation>This operation initiates a system restore from backed up configuration data using the HTTP
-				POST mechanism. The response to the command includes an HTTP URL to which the backup
-				file may be uploaded. The actual restore takes place as soon as the HTTP POST operation
-				has completed. Devices should support system restore through the StartSystemRestore
-				command. The exact format of the backup configuration data is outside the scope of this
-				specification.<br/>
-				System restore over HTTP may be achieved using the following steps:<ol>
-					<li>Client calls StartSystemRestore.</li>
-					<li>Server responds with upload URI.</li>
-					<li>Client transmits the configuration data to the upload URI using HTTP POST.</li>
-					<li>Server applies the uploaded configuration, then reboots if necessary.</li>
-				</ol>
-				If the system restore fails because the uploaded file was invalid, the HTTP POST response
-				shall be “415 Unsupported Media Type”. If the system restore fails due to an error at the
-				device, the HTTP POST response shall be “500 Internal Server Error”.<br/>
-				The value of the Content-Type header in the HTTP POST request shall be “application/octetstream”.</wsdl:documentation>
-			<wsdl:input message="tds:StartSystemRestoreRequest"/>
-			<wsdl:output message="tds:StartSystemRestoreResponse"/>
-		</wsdl:operation>
-
-		<wsdl:operation name="GetStorageConfigurations">
-			<wsdl:documentation>
-			This operation lists all existing storage configurations for the device. 
-			</wsdl:documentation>
-			<wsdl:input message="tds:GetStorageConfigurationsRequest"/>
-			<wsdl:output message="tds:GetStorageConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="CreateStorageConfiguration">
-			<wsdl:documentation>
-			This operation creates a new storage configuration. 
-			The configuration data shall be created in the device and shall be persistent (remain after reboot).
-			</wsdl:documentation>
-			<wsdl:input message="tds:CreateStorageConfigurationRequest"/>
-			<wsdl:output message="tds:CreateStorageConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetStorageConfiguration">
-			<wsdl:documentation>
-			This operation retrieves the Storage configuration associated with the given storage configuration token.
-			</wsdl:documentation>
-			<wsdl:input message="tds:GetStorageConfigurationRequest"/>
-			<wsdl:output message="tds:GetStorageConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetStorageConfiguration">
-			<wsdl:documentation>
-			This operation modifies an existing Storage configuration.
-			</wsdl:documentation>
-			<wsdl:input message="tds:SetStorageConfigurationRequest"/>
-			<wsdl:output message="tds:SetStorageConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteStorageConfiguration">
-			<wsdl:documentation>
-			This operation deletes the given storage configuration and configuration change shall always be persistent.
-			</wsdl:documentation>
-			<wsdl:input message="tds:DeleteStorageConfigurationRequest"/>
-			<wsdl:output message="tds:DeleteStorageConfigurationResponse"/>
-		</wsdl:operation>
-
-		<wsdl:operation name="GetGeoLocation">
-			<wsdl:documentation>
-				This operation lists all existing geo location configurations for the device. 
-			</wsdl:documentation>
-			<wsdl:input message="tds:GetGeoLocationRequest"/>
-			<wsdl:output message="tds:GetGeoLocationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetGeoLocation">
-			<wsdl:documentation>
-				This operation allows to modify one or more geo configuration entries.
-			</wsdl:documentation>
-			<wsdl:input message="tds:SetGeoLocationRequest"/>
-			<wsdl:output message="tds:SetGeoLocationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteGeoLocation">
-			<wsdl:documentation>
-				This operation deletes the given geo location entries.
-			</wsdl:documentation>
-			<wsdl:input message="tds:DeleteGeoLocationRequest"/>
-			<wsdl:output message="tds:DeleteGeoLocationResponse"/>
-		</wsdl:operation>
-		
-	</wsdl:portType>
-	<wsdl:binding name="DeviceBinding" type="tds:Device">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsdl:operation name="GetServices">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetServices"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetServiceCapabilities">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetServiceCapabilities"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDeviceInformation">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDeviceInformation"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetSystemDateAndTime">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetSystemDateAndTime"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemDateAndTime">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetSystemDateAndTime"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetSystemFactoryDefault">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetSystemFactoryDefault"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="UpgradeSystemFirmware">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/UpgradeSystemFirmware"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SystemReboot">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SystemReboot"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="RestoreSystem">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/RestoreSystem"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemBackup">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetSystemBackup"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemLog">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetSystemLog"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemSupportInformation">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetSystemSupportInformation"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetScopes">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetScopes"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetScopes">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetScopes"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="AddScopes">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/AddScopes"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveScopes">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/RemoveScopes"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDiscoveryMode">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDiscoveryMode"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetDiscoveryMode">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetDiscoveryMode"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetRemoteDiscoveryMode">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetRemoteDiscoveryMode"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetRemoteDiscoveryMode">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetRemoteDiscoveryMode"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDPAddresses">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDPAddresses"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetEndpointReference">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetEndpointReference"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetRemoteUser">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetRemoteUser"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetRemoteUser">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetRemoteUser"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetUsers">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetUsers"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="CreateUsers">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/CreateUsers"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteUsers">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/DeleteUsers"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetUser">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetUser"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetWsdlUrl">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetWsdlUrl"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCapabilities">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetCapabilities"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetDPAddresses">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetDPAddresses"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetHostname">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetHostname"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetHostname">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetHostname"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetHostnameFromDHCP">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetHostnameFromDHCP"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDNS">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDNS"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetDNS">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetDNS"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetNTP">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetNTP"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetNTP">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetNTP"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDynamicDNS">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDynamicDNS"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetDynamicDNS">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetDynamicDNS"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetNetworkInterfaces">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetNetworkInterfaces"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetNetworkInterfaces">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetNetworkInterfaces"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetNetworkProtocols">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetNetworkProtocols"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetNetworkProtocols">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetNetworkProtocols"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetNetworkDefaultGateway">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetNetworkDefaultGateway"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetNetworkDefaultGateway">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetNetworkDefaultGateway"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetZeroConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetZeroConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetZeroConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetZeroConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetIPAddressFilter">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetIPAddressFilter"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetIPAddressFilter">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetIPAddressFilter"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="AddIPAddressFilter">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/AddIPAddressFilter"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveIPAddressFilter">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/RemoveIPAddressFilter"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAccessPolicy">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetAccessPolicy"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetAccessPolicy">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetAccessPolicy"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="CreateCertificate">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/CreateCertificate"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCertificates">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetCertificates"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCertificatesStatus">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetCertificatesStatus"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetCertificatesStatus">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetCertificatesStatus"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteCertificates">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/DeleteCertificates"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetPkcs10Request">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetPkcs10Request"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="LoadCertificates">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/LoadCertificates"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetClientCertificateMode">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetClientCertificateMode"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetClientCertificateMode">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetClientCertificateMode"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetRelayOutputs">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetRelayOutputs"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetRelayOutputSettings">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetRelayOutputSettings"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetRelayOutputState">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetRelayOutputState"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SendAuxiliaryCommand">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SendAuxiliaryCommand"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCACertificates">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetCACertificates"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="LoadCertificateWithPrivateKey">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/LoadCertificateWithPrivateKey"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCertificateInformation">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetCertificateInformation"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="LoadCACertificates">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/LoadCACertificates"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="CreateDot1XConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/CreateDot1XConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetDot1XConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetDot1XConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDot1XConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDot1XConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDot1XConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDot1XConfigurations"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteDot1XConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/DeleteDot1XConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDot11Capabilities">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDot11Capabilities"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDot11Status">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDot11Status"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="ScanAvailableDot11Networks">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/ScanAvailableDot11Networks"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemUris">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetSystemUris"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="StartFirmwareUpgrade">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/StartFirmwareUpgrade"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="StartSystemRestore">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/StartSystemRestore"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="GetStorageConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetStorageConfigurations"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="CreateStorageConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/CreateStorageConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetStorageConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetStorageConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetStorageConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetStorageConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteStorageConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/DeleteStorageConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="GetGeoLocation">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetGeoLocation"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetGeoLocation">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetGeoLocation"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteGeoLocation">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/DeleteGeoLocation"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		
-		
-	</wsdl:binding>
-	<!--===============================-->
-	<!--===============================-->
-</wsdl:definitions>
diff --git a/src/onvif_srvd/onvif_srvd/wsdl/media.wsdl b/src/onvif_srvd/onvif_srvd/wsdl/media.wsdl
deleted file mode 100644
index f7978ad..0000000
--- a/src/onvif_srvd/onvif_srvd/wsdl/media.wsdl
+++ /dev/null
@@ -1,3687 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" href="../../../ver20/util/onvif-wsdl-viewer.xsl"?>
-<!--
-Copyright (c) 2008-2015 by ONVIF: Open Network Video Interface Forum. All rights reserved.
-
-Recipients of this document may copy, distribute, publish, or display this document so long as this copyright notice, license and disclaimer are retained with all copies of the document. No license is granted to modify this document.
-
-THIS DOCUMENT IS PROVIDED "AS IS," AND THE CORPORATION AND ITS MEMBERS AND THEIR AFFILIATES, MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THIS DOCUMENT ARE SUITABLE FOR ANY PURPOSE; OR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT, WHETHER OR NOT (1) THE CORPORATION, MEMBERS OR THEIR AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR (2) SUCH DAMAGES WERE REASONABLY FORESEEABLE, AND ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT.  THE FOREGOING DISCLAIMER AND LIMITATION ON LIABILITY DO NOT APPLY TO, INVALIDATE, OR LIMIT REPRESENTATIONS AND WARRANTIES MADE BY THE MEMBERS AND THEIR RESPECTIVE AFFILIATES TO THE CORPORATION AND OTHER MEMBERS IN CERTAIN WRITTEN POLICIES OF THE CORPORATION.
--->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:trt="http://www.onvif.org/ver10/media/wsdl" targetNamespace="http://www.onvif.org/ver10/media/wsdl">
-	<wsdl:types>
-		<xs:schema targetNamespace="http://www.onvif.org/ver10/media/wsdl" xmlns:tt="http://www.onvif.org/ver10/schema" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="2.6">
-			<xs:import namespace="http://www.onvif.org/ver10/schema" schemaLocation="../../../ver10/schema/onvif.xsd"/>
-			<!--  Message Request/Responses elements  -->
-			<!--===============================-->
-			<xs:element name="GetServiceCapabilities">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetServiceCapabilitiesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Capabilities" type="trt:Capabilities">
-							<xs:annotation>
-								<xs:documentation>The capabilities for the media service is returned in the Capabilities element.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:complexType name="Capabilities">
-				<xs:sequence>
-					<xs:element name="ProfileCapabilities" type="trt:ProfileCapabilities">
-						<xs:annotation>
-							<xs:documentation>Media profile capabilities.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="StreamingCapabilities" type="trt:StreamingCapabilities">
-						<xs:annotation>
-							<xs:documentation>Streaming capabilities.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:attribute name="SnapshotUri" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates if GetSnapshotUri is supported.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="Rotation" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates whether or not Rotation feature is supported.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="VideoSourceMode" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates the support for changing video source mode.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="OSD" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates if OSD is supported.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="EXICompression" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates the support for the Efficient XML Interchange (EXI) binary XML format.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<xs:element name="Capabilities" type="trt:Capabilities"/>
-			<!--===============================-->
-			<xs:complexType name="ProfileCapabilities">
-				<xs:sequence>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:attribute name="MaximumNumberOfProfiles" type="xs:int">
-					<xs:annotation>
-						<xs:documentation>Maximum number of profiles supported.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<!--===============================-->
-			<xs:complexType name="StreamingCapabilities">
-				<xs:sequence>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:attribute name="RTPMulticast" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for RTP multicast.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="RTP_TCP" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for RTP over TCP.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="RTP_RTSP_TCP" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for RTP/RTSP/TCP.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="NonAggregateControl" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for non aggregate RTSP control.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="NoRTSPStreaming" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation> Indicates the device does not support live media streaming via RTSP.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<!--===============================-->
-			<xs:element name="GetVideoSources">
-				<xs:complexType>
-					<xs:sequence>
-				   </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoSourcesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="VideoSources" type="tt:VideoSource" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>List of existing Video Sources</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioSources">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioSourcesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="AudioSources" type="tt:AudioSource" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>List of existing Audio Sources</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioOutputs">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioOutputsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="AudioOutputs" type="tt:AudioOutput" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>List of existing Audio Outputs</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="CreateProfile">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Name" type="tt:Name">
-							<xs:annotation>
-								<xs:documentation>friendly name of the profile to be created</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Token" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional token, specifying the unique identifier of the new profile. <br/>A device supports at least a token length of 12 characters and characters "A-Z" | "a-z" | "0-9" | "-.".</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CreateProfileResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Profile" type="tt:Profile">
-							<xs:annotation>
-								<xs:documentation>returns the new created profile</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetProfile">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>this command requests a specific profile</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetProfileResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Profile" type="tt:Profile">
-							<xs:annotation>
-								<xs:documentation>returns the requested media profile</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetProfiles">
-				<xs:complexType>
-					<xs:sequence>
-				
-      </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetProfilesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Profiles" type="tt:Profile" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>lists all profiles that exist in the media service </xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddVideoEncoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the VideoEncoderConfiguration to add</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddVideoEncoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-				   </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveVideoEncoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the media profile from which the
-VideoEncoderConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveVideoEncoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-    </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddVideoSourceConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the VideoSourceConfiguration to add</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddVideoSourceConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveVideoSourceConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the media profile from which the
-VideoSourceConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveVideoSourceConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddAudioEncoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the AudioEncoderConfiguration to add</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddAudioEncoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveAudioEncoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the media profile from which the
-AudioEncoderConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveAudioEncoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddAudioSourceConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the AudioSourceConfiguration to add</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddAudioSourceConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveAudioSourceConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the media profile from which the
-AudioSourceConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveAudioSourceConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddPTZConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the PTZConfiguration to add</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddPTZConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemovePTZConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the media profile from which the
-PTZConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemovePTZConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddVideoAnalyticsConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the VideoAnalyticsConfiguration to add</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddVideoAnalyticsConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveVideoAnalyticsConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the media profile from which the
-VideoAnalyticsConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveVideoAnalyticsConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddMetadataConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the MetadataConfiguration to add</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddMetadataConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveMetadataConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the media profile from which the
-MetadataConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveMetadataConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddAudioOutputConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the AudioOutputConfiguration to add</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddAudioOutputConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-                   </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveAudioOutputConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the media profile from which the
-AudioOutputConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveAudioOutputConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-                    </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddAudioDecoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>This element contains a reference to the profile where the configuration should be added.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>This element contains a reference to the AudioDecoderConfiguration to add.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddAudioDecoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-                    </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveAudioDecoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>This element contains a  reference to the media profile from which the AudioDecoderConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveAudioDecoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-                    </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="DeleteProfile">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>This element contains a  reference to the profile that should be deleted.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="DeleteProfileResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<!--===============================-->
-			<!--===============================-->
-			<xs:element name="GetVideoEncoderConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-      </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoEncoderConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:VideoEncoderConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of video encoder configurations.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetVideoSourceConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoSourceConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:VideoSourceConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of video source configurations.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioEncoderConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioEncoderConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:AudioEncoderConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of audio encoder configurations.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioSourceConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-      </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioSourceConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:AudioSourceConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of audio source configurations.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetVideoAnalyticsConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-      </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoAnalyticsConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:VideoAnalyticsConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of VideoAnalytics configurations.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetMetadataConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-      </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetMetadataConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:MetadataConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of metadata configurations</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<!--===============================-->
-			<xs:element name="GetAudioOutputConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-				   </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioOutputConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:AudioOutputConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of audio output configurations</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioDecoderConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-				   </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioDecoderConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:AudioDecoderConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of audio decoder configurations</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetVideoSourceConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested video source configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetVideoSourceConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:VideoSourceConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested video source configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetVideoEncoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested video encoder configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoEncoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:VideoEncoderConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested video encoder configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioSourceConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested audio source configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioSourceConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:AudioSourceConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested audio source configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioEncoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested audio encoder configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioEncoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:AudioEncoderConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested audio encoder configuration</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetVideoAnalyticsConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested video analytics configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoAnalyticsConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:VideoAnalyticsConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested video analytics configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetMetadataConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested metadata configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetMetadataConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:MetadataConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested metadata configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<!--===============================-->
-			<xs:element name="GetAudioOutputConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested audio output configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioOutputConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:AudioOutputConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested audio output configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioDecoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested audio decoder configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioDecoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:AudioDecoderConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested audio decoder configuration</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCompatibleVideoEncoderConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleVideoEncoderConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:VideoEncoderConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of video encoder configurations that are compatible with the specified media profile.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCompatibleVideoSourceConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleVideoSourceConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:VideoSourceConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of video source configurations that are compatible with the specified media profile.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCompatibleAudioEncoderConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleAudioEncoderConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:AudioEncoderConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of audio encoder configurations that are compatible with the specified media profile.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCompatibleAudioSourceConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleAudioSourceConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:AudioSourceConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of audio source configurations that are compatible with the specified media profile.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCompatibleVideoAnalyticsConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleVideoAnalyticsConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:VideoAnalyticsConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of video analytics configurations that are compatible with the specified media profile.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCompatibleMetadataConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleMetadataConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:MetadataConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of metadata configurations that are compatible with the specified media profile.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<!--===============================-->
-			<xs:element name="GetCompatibleAudioOutputConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleAudioOutputConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:AudioOutputConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of audio output configurations that are compatible with the specified media profile.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCompatibleAudioDecoderConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleAudioDecoderConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:AudioDecoderConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of audio decoder configurations that are compatible with the specified media profile. </xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<!--===============================-->
-			<!--===============================-->
-			<!--===============================-->
-			<!--===============================-->
-			<!--===============================-->
-			<xs:element name="SetVideoEncoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:VideoEncoderConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified video encoder configuration. The configuration shall exist in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetVideoEncoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetVideoSourceConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:VideoSourceConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified video source configuration. The configuration shall exist in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetVideoSourceConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetAudioEncoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:AudioEncoderConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified audio encoder configuration. The configuration shall exist in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetAudioEncoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetAudioSourceConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:AudioSourceConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified audio source configuration. The configuration shall exist in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetAudioSourceConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetVideoAnalyticsConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:VideoAnalyticsConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified video analytics configuration. The configuration shall exist in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetVideoAnalyticsConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetMetadataConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:MetadataConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified metadata configuration. The configuration shall exist in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetMetadataConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<!--===============================-->
-			<xs:element name="SetAudioOutputConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:AudioOutputConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified audio output configuration. The configuration shall exist in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetAudioOutputConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-				   </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetAudioDecoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:AudioDecoderConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified audio decoder configuration. The configuration shall exist in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetAudioDecoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-				   </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetVideoSourceConfigurationOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional video source configurationToken that specifies an existing configuration that the options are intended for.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoSourceConfigurationOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Options" type="tt:VideoSourceConfigurationOptions">
-							<xs:annotation>
-								<xs:documentation>This message contains the video source configuration options. If a video source configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetVideoEncoderConfigurationOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional video encoder configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoEncoderConfigurationOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Options" type="tt:VideoEncoderConfigurationOptions"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioSourceConfigurationOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional audio source configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioSourceConfigurationOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Options" type="tt:AudioSourceConfigurationOptions">
-							<xs:annotation>
-								<xs:documentation>This message contains the audio source configuration options. If a audio source configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioEncoderConfigurationOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional audio encoder configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioEncoderConfigurationOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Options" type="tt:AudioEncoderConfigurationOptions">
-							<xs:annotation>
-								<xs:documentation>This message contains the audio encoder configuration options. If a audio encoder configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetMetadataConfigurationOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional metadata configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetMetadataConfigurationOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Options" type="tt:MetadataConfigurationOptions">
-							<xs:annotation>
-								<xs:documentation>This message contains the metadata configuration options. If a metadata configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioOutputConfigurationOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional audio output configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioOutputConfigurationOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Options" type="tt:AudioOutputConfigurationOptions">
-							<xs:annotation>
-								<xs:documentation>This message contains the audio output configuration options. If a audio output configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioDecoderConfigurationOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional audio decoder configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioDecoderConfigurationOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Options" type="tt:AudioDecoderConfigurationOptions">
-							<xs:annotation>
-								<xs:documentation>This message contains the audio decoder configuration options. If a audio decoder configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetGuaranteedNumberOfVideoEncoderInstances">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the video source configuration</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetGuaranteedNumberOfVideoEncoderInstancesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="TotalNumber" type="xs:int">
-							<xs:annotation>
-								<xs:documentation>The minimum guaranteed total number of encoder instances (applications) per VideoSourceConfiguration. The device is able to deliver the TotalNumber of streams</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="JPEG" type="xs:int" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>If a device limits the number of instances for respective Video Codecs the response contains the information how many Jpeg streams can be set up at the same time per VideoSource.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="H264" type="xs:int" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>If a device limits the number of instances for respective Video Codecs the response contains the information how many H264 streams can be set up at the same time per VideoSource.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="MPEG4" type="xs:int" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>If a device limits the number of instances for respective Video Codecs the response contains the information how many Mpeg4 streams can be set up at the same time per VideoSource.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetStreamUri">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="StreamSetup" type="tt:StreamSetup">
-							<xs:annotation>
-								<xs:documentation>Stream Setup that should be used with the uri</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>The ProfileToken element indicates the media profile to use and will define the configuration of the content of the stream.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetStreamUriResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MediaUri" type="tt:MediaUri">
-							<xs:annotation>
-								<xs:documentation/>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="StartMulticastStreaming">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of the Profile that is used to define the multicast stream.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="StartMulticastStreamingResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="StopMulticastStreaming">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of the Profile that is used to define the multicast stream.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="StopMulticastStreamingResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetSynchronizationPoint">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a Profile reference for which a Synchronization Point is requested.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetSynchronizationPointResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetSnapshotUri">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>The ProfileToken element indicates the media profile to use and will define the source and dimensions of the snapshot.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetSnapshotUriResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MediaUri" type="tt:MediaUri">
-							<xs:annotation>
-								<xs:documentation/>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--================ Video Source Mode ===============-->
-			<xs:element name="GetVideoSourceModes">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="VideoSourceToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a video source reference for which a video source mode is requested.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoSourceModesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="VideoSourceModes" type="trt:VideoSourceMode" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Return the information for specified video source mode.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetVideoSourceMode">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="VideoSourceToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a video source reference for which a video source mode is requested.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="VideoSourceModeToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Indicate video source mode.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetVideoSourceModeResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Reboot" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The response contains information about rebooting after returning response. When Reboot is set true, a device will reboot automatically after setting mode.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:simpleType name="EncodingTypes">
-				<xs:annotation>
-					<xs:documentation>Indication which encodings are supported for this video source. The list may contain one or more enumeration values of tt:VideoEncoding.</xs:documentation>
-				</xs:annotation>
-				<xs:list itemType="xs:string"/>
-			</xs:simpleType>
-			<!--===============================-->
-			<xs:complexType name="VideoSourceMode"> 
-				<xs:sequence>
-					<xs:element name="MaxFramerate" type="xs:float">
-						<xs:annotation>
-							<xs:documentation>Max frame rate in frames per second for this video source mode.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="MaxResolution" type="tt:VideoResolution">
-						<xs:annotation>
-							<xs:documentation>Max horizontal and vertical resolution for this video source mode.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Encodings" type="trt:EncodingTypes">
-						<xs:annotation>
-							<xs:documentation>Indication which encodings are supported for this video source. The list may contain one or more enumeration values of tt:VideoEncoding.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Reboot" type="xs:boolean">
-						<xs:annotation>
-							<xs:documentation>After setting the mode if a device starts to reboot this value is true. If a device change the mode without rebooting this value is false. If true, configured parameters may not be guaranteed by the device after rebooting.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Description" type="tt:Description" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Informative description of this video source mode. This field should be described in English.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="trt:VideoSourceModeExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:attribute name="token" type="tt:ReferenceToken" use="required">
-					<xs:annotation>
-						<xs:documentation>Indicate token for video source mode.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="Enabled" type="xs:boolean"> 
-					<xs:annotation>
-						<xs:documentation>Indication of whether this mode is active. If active this value is true. In case of non-indication, it means as false. The value of true shall be had by only one video source mode.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<!--===============================-->
-			<xs:complexType name="VideoSourceModeExtension"> 
-				<xs:sequence>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-
-			<!--===============================-->
-			<!--============OSD Schema Begin================-->
-			<xs:element name="GetOSDs">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0" maxOccurs="1">
-							<xs:annotation>
-								<xs:documentation>Token of the Video Source Configuration, which has OSDs associated with are requested. If token not exist, request all available OSDs.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetOSDsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OSDs" type="tt:OSDConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of requested OSDs.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetOSD">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OSDToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>The GetOSD command fetches the OSD configuration if the OSD token is known.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetOSDResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OSD" type="tt:OSDConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested OSD configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetOSD">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OSD" type="tt:OSDConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified OSD configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetOSDResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetOSDOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Video Source Configuration Token that specifies an existing video source configuration that the options shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetOSDOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OSDOptions" type="tt:OSDConfigurationOptions">
-							<xs:annotation>
-								<xs:documentation/>
-							</xs:annotation>
-						</xs:element>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="CreateOSD">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OSD" type="tt:OSDConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contain the initial OSD configuration for create.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CreateOSDResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OSDToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Returns Token of the newly created OSD</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="DeleteOSD">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OSDToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>This element contains a reference to the OSD configuration that should be deleted.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="DeleteOSDResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--============OSD Schema End================-->
-		</xs:schema>
-	</wsdl:types>
-	<wsdl:message name="GetServiceCapabilitiesRequest">
-		<wsdl:part name="parameters" element="trt:GetServiceCapabilities"/>
-	</wsdl:message>
-	<wsdl:message name="GetServiceCapabilitiesResponse">
-		<wsdl:part name="parameters" element="trt:GetServiceCapabilitiesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourcesRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoSources"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourcesResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoSourcesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioSourcesRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioSources"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioSourcesResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioSourcesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioOutputsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioOutputs"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioOutputsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioOutputsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="CreateProfileRequest">
-		<wsdl:part name="parameters" element="trt:CreateProfile"/>
-	</wsdl:message>
-	<wsdl:message name="CreateProfileResponse">
-		<wsdl:part name="parameters" element="trt:CreateProfileResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetProfileRequest">
-		<wsdl:part name="parameters" element="trt:GetProfile"/>
-	</wsdl:message>
-	<wsdl:message name="GetProfileResponse">
-		<wsdl:part name="parameters" element="trt:GetProfileResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetProfilesRequest">
-		<wsdl:part name="parameters" element="trt:GetProfiles"/>
-	</wsdl:message>
-	<wsdl:message name="GetProfilesResponse">
-		<wsdl:part name="parameters" element="trt:GetProfilesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddVideoEncoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddVideoEncoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddVideoEncoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddVideoEncoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveVideoEncoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemoveVideoEncoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveVideoEncoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemoveVideoEncoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddVideoSourceConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddVideoSourceConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddVideoSourceConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddVideoSourceConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveVideoSourceConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemoveVideoSourceConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveVideoSourceConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemoveVideoSourceConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddAudioEncoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddAudioEncoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddAudioEncoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddAudioEncoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveAudioEncoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemoveAudioEncoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveAudioEncoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemoveAudioEncoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddAudioSourceConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddAudioSourceConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddAudioSourceConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddAudioSourceConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveAudioSourceConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemoveAudioSourceConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveAudioSourceConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemoveAudioSourceConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddPTZConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddPTZConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddPTZConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddPTZConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemovePTZConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemovePTZConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemovePTZConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemovePTZConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddVideoAnalyticsConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddVideoAnalyticsConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddVideoAnalyticsConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddVideoAnalyticsConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveVideoAnalyticsConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemoveVideoAnalyticsConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveVideoAnalyticsConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemoveVideoAnalyticsConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddMetadataConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddMetadataConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddMetadataConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddMetadataConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveMetadataConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemoveMetadataConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveMetadataConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemoveMetadataConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddAudioOutputConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddAudioOutputConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddAudioOutputConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddAudioOutputConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveAudioOutputConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemoveAudioOutputConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveAudioOutputConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemoveAudioOutputConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddAudioDecoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddAudioDecoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddAudioDecoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddAudioDecoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveAudioDecoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemoveAudioDecoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveAudioDecoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemoveAudioDecoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteProfileRequest">
-		<wsdl:part name="parameters" element="trt:DeleteProfile"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteProfileResponse">
-		<wsdl:part name="parameters" element="trt:DeleteProfileResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourceConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoSourceConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourceConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoSourceConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoEncoderConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoEncoderConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioSourceConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioSourceConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioSourceConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioSourceConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioEncoderConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioEncoderConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoAnalyticsConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoAnalyticsConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoAnalyticsConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoAnalyticsConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetMetadataConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetMetadataConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetMetadataConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetMetadataConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioOutputConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioOutputConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioOutputConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioOutputConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioDecoderConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioDecoderConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourceConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoSourceConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourceConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoSourceConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoEncoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoEncoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioSourceConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioSourceConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioSourceConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioSourceConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioEncoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioEncoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoAnalyticsConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoAnalyticsConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoAnalyticsConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoAnalyticsConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetMetadataConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:GetMetadataConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetMetadataConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:GetMetadataConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioOutputConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioOutputConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioOutputConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioOutputConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioDecoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioDecoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleVideoEncoderConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetCompatibleVideoEncoderConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleVideoEncoderConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetCompatibleVideoEncoderConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleVideoSourceConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetCompatibleVideoSourceConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleVideoSourceConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetCompatibleVideoSourceConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleAudioEncoderConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetCompatibleAudioEncoderConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleAudioEncoderConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetCompatibleAudioEncoderConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleAudioSourceConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetCompatibleAudioSourceConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleAudioSourceConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetCompatibleAudioSourceConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleVideoAnalyticsConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetCompatibleVideoAnalyticsConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleVideoAnalyticsConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetCompatibleVideoAnalyticsConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleMetadataConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetCompatibleMetadataConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleMetadataConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetCompatibleMetadataConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleAudioOutputConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetCompatibleAudioOutputConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleAudioOutputConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetCompatibleAudioOutputConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleAudioDecoderConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetCompatibleAudioDecoderConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleAudioDecoderConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetCompatibleAudioDecoderConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetVideoSourceConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:SetVideoSourceConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetVideoSourceConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:SetVideoSourceConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetVideoEncoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:SetVideoEncoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetVideoEncoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:SetVideoEncoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetAudioSourceConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:SetAudioSourceConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetAudioSourceConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:SetAudioSourceConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetAudioEncoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:SetAudioEncoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetAudioEncoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:SetAudioEncoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetVideoAnalyticsConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:SetVideoAnalyticsConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetVideoAnalyticsConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:SetVideoAnalyticsConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetMetadataConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:SetMetadataConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetMetadataConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:SetMetadataConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetAudioOutputConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:SetAudioOutputConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetAudioOutputConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:SetAudioOutputConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetAudioDecoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:SetAudioDecoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetAudioDecoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:SetAudioDecoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourceConfigurationOptionsRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoSourceConfigurationOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourceConfigurationOptionsResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoSourceConfigurationOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoEncoderConfigurationOptionsRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfigurationOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoEncoderConfigurationOptionsResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfigurationOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioSourceConfigurationOptionsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioSourceConfigurationOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioSourceConfigurationOptionsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioSourceConfigurationOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioEncoderConfigurationOptionsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfigurationOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioEncoderConfigurationOptionsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfigurationOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetMetadataConfigurationOptionsRequest">
-		<wsdl:part name="parameters" element="trt:GetMetadataConfigurationOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetMetadataConfigurationOptionsResponse">
-		<wsdl:part name="parameters" element="trt:GetMetadataConfigurationOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioOutputConfigurationOptionsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioOutputConfigurationOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioOutputConfigurationOptionsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioOutputConfigurationOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioDecoderConfigurationOptionsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfigurationOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioDecoderConfigurationOptionsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfigurationOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetGuaranteedNumberOfVideoEncoderInstancesRequest">
-		<wsdl:part name="parameters" element="trt:GetGuaranteedNumberOfVideoEncoderInstances"/>
-	</wsdl:message>
-	<wsdl:message name="GetGuaranteedNumberOfVideoEncoderInstancesResponse">
-		<wsdl:part name="parameters" element="trt:GetGuaranteedNumberOfVideoEncoderInstancesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetStreamUriRequest">
-		<wsdl:part name="parameters" element="trt:GetStreamUri"/>
-	</wsdl:message>
-	<wsdl:message name="GetStreamUriResponse">
-		<wsdl:part name="parameters" element="trt:GetStreamUriResponse"/>
-	</wsdl:message>
-	<wsdl:message name="StartMulticastStreamingRequest">
-		<wsdl:part name="parameters" element="trt:StartMulticastStreaming"/>
-	</wsdl:message>
-	<wsdl:message name="StartMulticastStreamingResponse">
-		<wsdl:part name="parameters" element="trt:StartMulticastStreamingResponse"/>
-	</wsdl:message>
-	<wsdl:message name="StopMulticastStreamingRequest">
-		<wsdl:part name="parameters" element="trt:StopMulticastStreaming"/>
-	</wsdl:message>
-	<wsdl:message name="StopMulticastStreamingResponse">
-		<wsdl:part name="parameters" element="trt:StopMulticastStreamingResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetSynchronizationPointRequest">
-		<wsdl:part name="parameters" element="trt:SetSynchronizationPoint"/>
-	</wsdl:message>
-	<wsdl:message name="SetSynchronizationPointResponse">
-		<wsdl:part name="parameters" element="trt:SetSynchronizationPointResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetSnapshotUriRequest">
-		<wsdl:part name="parameters" element="trt:GetSnapshotUri"/>
-	</wsdl:message>
-	<wsdl:message name="GetSnapshotUriResponse">
-		<wsdl:part name="parameters" element="trt:GetSnapshotUriResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourceModesRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoSourceModes"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourceModesResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoSourceModesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetVideoSourceModeRequest">
-		<wsdl:part name="parameters" element="trt:SetVideoSourceMode"/>
-	</wsdl:message>
-	<wsdl:message name="SetVideoSourceModeResponse">
-		<wsdl:part name="parameters" element="trt:SetVideoSourceModeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetOSDsRequest">
-		<wsdl:part name="parameters" element="trt:GetOSDs"/>
-	</wsdl:message>
-	<wsdl:message name="GetOSDsResponse">
-		<wsdl:part name="parameters" element="trt:GetOSDsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetOSDRequest">
-		<wsdl:part name="parameters" element="trt:GetOSD"/>
-	</wsdl:message>
-	<wsdl:message name="GetOSDResponse">
-		<wsdl:part name="parameters" element="trt:GetOSDResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetOSDOptionsRequest">
-		<wsdl:part name="parameters" element="trt:GetOSDOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetOSDOptionsResponse">
-		<wsdl:part name="parameters" element="trt:GetOSDOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetOSDRequest">
-		<wsdl:part name="parameters" element="trt:SetOSD"/>
-	</wsdl:message>
-	<wsdl:message name="SetOSDResponse">
-		<wsdl:part name="parameters" element="trt:SetOSDResponse"/>
-	</wsdl:message>
-	<wsdl:message name="CreateOSDRequest">
-		<wsdl:part name="parameters" element="trt:CreateOSD"/>
-	</wsdl:message>
-	<wsdl:message name="CreateOSDResponse">
-		<wsdl:part name="parameters" element="trt:CreateOSDResponse"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteOSDRequest">
-		<wsdl:part name="parameters" element="trt:DeleteOSD"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteOSDResponse">
-		<wsdl:part name="parameters" element="trt:DeleteOSDResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="Media">
-		<!--===============================-->
-		<!--===============================-->
-		<wsdl:operation name="GetServiceCapabilities">
-			<wsdl:documentation>Returns the capabilities of the media service. The result is returned in a typed answer.</wsdl:documentation>
-			<wsdl:input message="trt:GetServiceCapabilitiesRequest"/>
-			<wsdl:output message="trt:GetServiceCapabilitiesResponse"/>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetVideoSources">
-			<wsdl:documentation>This command lists all available physical video inputs of the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoSourcesRequest"/>
-			<wsdl:output message="trt:GetVideoSourcesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioSources">
-			<wsdl:documentation>This command lists all available physical audio inputs of the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioSourcesRequest"/>
-			<wsdl:output message="trt:GetAudioSourcesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioOutputs">
-			<wsdl:documentation>This command lists all available physical audio outputs of the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioOutputsRequest"/>
-			<wsdl:output message="trt:GetAudioOutputsResponse"/>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="CreateProfile">
-			<wsdl:documentation>This operation creates a new empty media profile. The media profile shall be created in the
-device and shall be persistent (remain after reboot). A created profile shall be deletable and a device shall set the “fixed” attribute to false in the
-returned Profile.</wsdl:documentation>
-			<wsdl:input message="trt:CreateProfileRequest"/>
-			<wsdl:output message="trt:CreateProfileResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetProfile">
-			<wsdl:documentation>If the profile token is already known, a profile can be fetched through the GetProfile command.</wsdl:documentation>
-			<wsdl:input message="trt:GetProfileRequest"/>
-			<wsdl:output message="trt:GetProfileResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetProfiles">
-			<wsdl:documentation>Any endpoint can ask for the existing media profiles of a device using the GetProfiles
-command. Pre-configured or dynamically configured profiles can be retrieved using this
-command. This command lists all configured profiles in a device. The client does not need to
-know the media profile in order to use the command.</wsdl:documentation>
-			<wsdl:input message="trt:GetProfilesRequest"/>
-			<wsdl:output message="trt:GetProfilesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddVideoEncoderConfiguration">
-			<wsdl:documentation>This operation adds a VideoEncoderConfiguration to an existing media profile. If a
-configuration exists in the media profile, it will be replaced. The change shall be persistent. A device shall
-support adding a compatible VideoEncoderConfiguration to a Profile containing a VideoSourceConfiguration and shall
-support streaming video data of such a profile.
-			</wsdl:documentation>
-			<wsdl:input message="trt:AddVideoEncoderConfigurationRequest"/>
-			<wsdl:output message="trt:AddVideoEncoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveVideoEncoderConfiguration">
-			<wsdl:documentation>This operation removes a VideoEncoderConfiguration from an existing media profile. If the
-media profile does not contain a VideoEncoderConfiguration, the operation has no effect. The removal shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:RemoveVideoEncoderConfigurationRequest"/>
-			<wsdl:output message="trt:RemoveVideoEncoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddVideoSourceConfiguration">
-			<wsdl:documentation>This operation adds a VideoSourceConfiguration to an existing media profile. If such a
-configuration exists in the media profile, it will be replaced. The change shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:AddVideoSourceConfigurationRequest"/>
-			<wsdl:output message="trt:AddVideoSourceConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveVideoSourceConfiguration">
-			<wsdl:documentation>This operation removes a VideoSourceConfiguration from an existing media profile. If the
-media profile does not contain a VideoSourceConfiguration, the operation has no effect. The removal shall be persistent. Video source configurations should only be removed after removing a
-VideoEncoderConfiguration from the media profile.</wsdl:documentation>
-			<wsdl:input message="trt:RemoveVideoSourceConfigurationRequest"/>
-			<wsdl:output message="trt:RemoveVideoSourceConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddAudioEncoderConfiguration">
-			<wsdl:documentation>This operation adds an AudioEncoderConfiguration to an existing media profile. If a 
-configuration exists in the media profile, it will be replaced. The change shall be persistent. A device shall
-support adding a compatible AudioEncoderConfiguration to a profile containing an AudioSourceConfiguration and shall
-support streaming audio data of such a profile.
-			</wsdl:documentation>
-			<wsdl:input message="trt:AddAudioEncoderConfigurationRequest"/>
-			<wsdl:output message="trt:AddAudioEncoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveAudioEncoderConfiguration">
-			<wsdl:documentation>This operation removes an AudioEncoderConfiguration from an existing media profile. If the
-media profile does not contain an AudioEncoderConfiguration, the operation has no effect.
-The removal shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:RemoveAudioEncoderConfigurationRequest"/>
-			<wsdl:output message="trt:RemoveAudioEncoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddAudioSourceConfiguration">
-			<wsdl:documentation>This operation adds an AudioSourceConfiguration to an existing media profile. If a
-configuration exists in the media profile, it will be replaced. The change shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:AddAudioSourceConfigurationRequest"/>
-			<wsdl:output message="trt:AddAudioSourceConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveAudioSourceConfiguration">
-			<wsdl:documentation>This operation removes an AudioSourceConfiguration from an existing media profile. If the
-media profile does not contain an AudioSourceConfiguration, the operation has no effect. The
-removal shall be persistent. Audio source configurations should only be removed after removing an
-AudioEncoderConfiguration from the media profile.</wsdl:documentation>
-			<wsdl:input message="trt:RemoveAudioSourceConfigurationRequest"/>
-			<wsdl:output message="trt:RemoveAudioSourceConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddPTZConfiguration">
-			<wsdl:documentation>This operation adds a PTZConfiguration to an existing media profile. If a configuration exists
-in the media profile, it will be replaced. The change shall be persistent. Adding a PTZConfiguration to a media profile means that streams using that media profile can
-contain PTZ status (in the metadata), and that the media profile can be used for controlling
-PTZ movement.</wsdl:documentation>
-			<wsdl:input message="trt:AddPTZConfigurationRequest"/>
-			<wsdl:output message="trt:AddPTZConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemovePTZConfiguration">
-			<wsdl:documentation>This operation removes a PTZConfiguration from an existing media profile. If the media profile
-does not contain a PTZConfiguration, the operation has no effect. The removal shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:RemovePTZConfigurationRequest"/>
-			<wsdl:output message="trt:RemovePTZConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddVideoAnalyticsConfiguration">
-			<wsdl:documentation>This operation adds a VideoAnalytics configuration to an existing media profile. If a
-configuration exists in the media profile, it will be replaced. The change shall be persistent. Adding a VideoAnalyticsConfiguration to a media profile means that streams using that media
-profile can contain video analytics data (in the metadata) as defined by the submitted configuration reference. A profile containing only a video analytics configuration but no video source configuration is incomplete. Therefore, a client should first add a video source configuration to a profile before adding a video analytics configuration. The device can deny adding of a video analytics
-configuration before a video source configuration.</wsdl:documentation>
-			<wsdl:input message="trt:AddVideoAnalyticsConfigurationRequest"/>
-			<wsdl:output message="trt:AddVideoAnalyticsConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveVideoAnalyticsConfiguration">
-			<wsdl:documentation>This operation removes a VideoAnalyticsConfiguration from an existing media profile. If the media profile does not contain a VideoAnalyticsConfiguration, the operation has no effect.
-The removal shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:RemoveVideoAnalyticsConfigurationRequest"/>
-			<wsdl:output message="trt:RemoveVideoAnalyticsConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddMetadataConfiguration">
-			<wsdl:documentation>This operation adds a Metadata configuration to an existing media profile. If a configuration exists in the media profile, it will be replaced. The change shall be persistent. Adding a MetadataConfiguration to a Profile means that streams using that profile contain metadata. Metadata can consist of events, PTZ status, and/or video analytics data.</wsdl:documentation>
-			<wsdl:input message="trt:AddMetadataConfigurationRequest"/>
-			<wsdl:output message="trt:AddMetadataConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveMetadataConfiguration">
-			<wsdl:documentation>This operation removes a MetadataConfiguration from an existing media profile. If the media profile does not contain a MetadataConfiguration, the operation has no effect. The removal shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:RemoveMetadataConfigurationRequest"/>
-			<wsdl:output message="trt:RemoveMetadataConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddAudioOutputConfiguration">
-			<wsdl:documentation>This operation adds an AudioOutputConfiguration to an existing media profile. If a configuration exists in the media profile, it will be replaced. The change shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:AddAudioOutputConfigurationRequest"/>
-			<wsdl:output message="trt:AddAudioOutputConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveAudioOutputConfiguration">
-			<wsdl:documentation>This operation removes an AudioOutputConfiguration from an existing media profile. If the media profile does not contain an AudioOutputConfiguration, the operation has no effect. The removal shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:RemoveAudioOutputConfigurationRequest"/>
-			<wsdl:output message="trt:RemoveAudioOutputConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddAudioDecoderConfiguration">
-			<wsdl:documentation>This operation adds an AudioDecoderConfiguration to an existing media profile. If a configuration exists in the media profile, it shall be replaced. The change shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:AddAudioDecoderConfigurationRequest"/>
-			<wsdl:output message="trt:AddAudioDecoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveAudioDecoderConfiguration">
-			<wsdl:documentation>This operation removes an AudioDecoderConfiguration from an existing media profile. If the media profile does not contain an AudioDecoderConfiguration, the operation has no effect. The removal shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:RemoveAudioDecoderConfigurationRequest"/>
-			<wsdl:output message="trt:RemoveAudioDecoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteProfile">
-			<wsdl:documentation>This operation deletes a profile. This change shall always be persistent. Deletion of a profile is only possible for non-fixed profiles</wsdl:documentation>
-			<wsdl:input message="trt:DeleteProfileRequest"/>
-			<wsdl:output message="trt:DeleteProfileResponse"/>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetVideoSourceConfigurations">
-			<wsdl:documentation>This operation lists all existing video source configurations for a device. The client need not know anything about the video source configurations in order to use the command.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoSourceConfigurationsRequest"/>
-			<wsdl:output message="trt:GetVideoSourceConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoEncoderConfigurations">
-			<wsdl:documentation>This operation lists all existing video encoder configurations of a device. This command lists all configured video encoder configurations in a device. The client need not know anything apriori about the video encoder configurations in order to use the command.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoEncoderConfigurationsRequest"/>
-			<wsdl:output message="trt:GetVideoEncoderConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioSourceConfigurations">
-			<wsdl:documentation>This operation lists all existing audio source configurations of a device. This command lists all audio source configurations in a device. The client need not know anything apriori about the audio source configurations in order to use the command.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioSourceConfigurationsRequest"/>
-			<wsdl:output message="trt:GetAudioSourceConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioEncoderConfigurations">
-			<wsdl:documentation>This operation lists all existing device audio encoder configurations. The client need not know anything apriori about the audio encoder configurations in order to use the command.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioEncoderConfigurationsRequest"/>
-			<wsdl:output message="trt:GetAudioEncoderConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoAnalyticsConfigurations">
-			<wsdl:documentation>This operation lists all video analytics configurations of a device. This command lists all configured video analytics in a device. The client need not know anything apriori about the video analytics in order to use the command.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoAnalyticsConfigurationsRequest"/>
-			<wsdl:output message="trt:GetVideoAnalyticsConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetMetadataConfigurations">
-			<wsdl:documentation>This operation lists all existing metadata configurations. The client need not know anything apriori about the metadata in order to use the command.</wsdl:documentation>
-			<wsdl:input message="trt:GetMetadataConfigurationsRequest"/>
-			<wsdl:output message="trt:GetMetadataConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioOutputConfigurations">
-			<wsdl:documentation>This command lists all existing AudioOutputConfigurations of a device. The NVC need not know anything apriori about the audio configurations to use this command.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioOutputConfigurationsRequest"/>
-			<wsdl:output message="trt:GetAudioOutputConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioDecoderConfigurations">
-			<wsdl:documentation>This command lists all existing AudioDecoderConfigurations of a device. The NVC need not know anything apriori about the audio decoder configurations in order to
-use this command.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioDecoderConfigurationsRequest"/>
-			<wsdl:output message="trt:GetAudioDecoderConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoSourceConfiguration">
-			<wsdl:documentation>If the video source configuration token is already known, the video source configuration can be fetched through the GetVideoSourceConfiguration command.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoSourceConfigurationRequest"/>
-			<wsdl:output message="trt:GetVideoSourceConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoEncoderConfiguration">
-			<wsdl:documentation>If the video encoder configuration token is already known, the encoder configuration can be fetched through the GetVideoEncoderConfiguration command.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoEncoderConfigurationRequest"/>
-			<wsdl:output message="trt:GetVideoEncoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioSourceConfiguration">
-			<wsdl:documentation>The GetAudioSourceConfiguration command fetches the audio source configurations if the audio source configuration token is already known. An</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioSourceConfigurationRequest"/>
-			<wsdl:output message="trt:GetAudioSourceConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioEncoderConfiguration">
-			<wsdl:documentation>The GetAudioEncoderConfiguration command fetches the encoder configuration if the audio encoder configuration token is known.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioEncoderConfigurationRequest"/>
-			<wsdl:output message="trt:GetAudioEncoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoAnalyticsConfiguration">
-			<wsdl:documentation>The GetVideoAnalyticsConfiguration command fetches the video analytics configuration if the video analytics token is known.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoAnalyticsConfigurationRequest"/>
-			<wsdl:output message="trt:GetVideoAnalyticsConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetMetadataConfiguration">
-			<wsdl:documentation>The GetMetadataConfiguration command fetches the metadata configuration if the metadata token is known.</wsdl:documentation>
-			<wsdl:input message="trt:GetMetadataConfigurationRequest"/>
-			<wsdl:output message="trt:GetMetadataConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioOutputConfiguration">
-			<wsdl:documentation>If the audio output configuration token is already known, the output configuration can be fetched through the GetAudioOutputConfiguration command.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioOutputConfigurationRequest"/>
-			<wsdl:output message="trt:GetAudioOutputConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioDecoderConfiguration">
-			<wsdl:documentation>If the audio decoder configuration token is already known, the decoder configuration can be fetched through the GetAudioDecoderConfiguration command.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioDecoderConfigurationRequest"/>
-			<wsdl:output message="trt:GetAudioDecoderConfigurationResponse"/>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetCompatibleVideoEncoderConfigurations">
-			<wsdl:documentation>This operation lists all the video encoder configurations of the device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddVideoEncoderConfiguration command on the media profile. The result will vary depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetCompatibleVideoEncoderConfigurationsRequest"/>
-			<wsdl:output message="trt:GetCompatibleVideoEncoderConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleVideoSourceConfigurations">
-			<wsdl:documentation>This operation requests all the video source configurations of the device that are compatible
-with a certain media profile. Each of the returned configurations shall be a valid input
-parameter for the AddVideoSourceConfiguration command on the media profile. The result
-will vary depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetCompatibleVideoSourceConfigurationsRequest"/>
-			<wsdl:output message="trt:GetCompatibleVideoSourceConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleAudioEncoderConfigurations">
-			<wsdl:documentation>This operation requests all audio encoder configurations of a device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddAudioSourceConfiguration command on the media profile. The result varies depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetCompatibleAudioEncoderConfigurationsRequest"/>
-			<wsdl:output message="trt:GetCompatibleAudioEncoderConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleAudioSourceConfigurations">
-			<wsdl:documentation>This operation requests all audio source configurations of the device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddAudioEncoderConfiguration command on the media profile. The result varies depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetCompatibleAudioSourceConfigurationsRequest"/>
-			<wsdl:output message="trt:GetCompatibleAudioSourceConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleVideoAnalyticsConfigurations">
-			<wsdl:documentation>This operation requests all video analytic configurations of the device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddVideoAnalyticsConfiguration command on the media profile. The result varies depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetCompatibleVideoAnalyticsConfigurationsRequest"/>
-			<wsdl:output message="trt:GetCompatibleVideoAnalyticsConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleMetadataConfigurations">
-			<wsdl:documentation>This operation requests all the metadata configurations of the device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddMetadataConfiguration command on the media profile. The result varies depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetCompatibleMetadataConfigurationsRequest"/>
-			<wsdl:output message="trt:GetCompatibleMetadataConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleAudioOutputConfigurations">
-			<wsdl:documentation>This command lists all audio output configurations of a device that are compatible with a certain media profile. Each returned configuration shall be a valid input for the 
-AddAudioOutputConfiguration command.</wsdl:documentation>
-			<wsdl:input message="trt:GetCompatibleAudioOutputConfigurationsRequest"/>
-			<wsdl:output message="trt:GetCompatibleAudioOutputConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleAudioDecoderConfigurations">
-			<wsdl:documentation>This operation lists all the audio decoder configurations of the device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddAudioDecoderConfiguration command on the media profile.</wsdl:documentation>
-			<wsdl:input message="trt:GetCompatibleAudioDecoderConfigurationsRequest"/>
-			<wsdl:output message="trt:GetCompatibleAudioDecoderConfigurationsResponse"/>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="SetVideoSourceConfiguration">
-			<wsdl:documentation>This operation modifies a video source configuration. The ForcePersistence flag indicates if the changes shall remain after reboot of the device. Running streams using this configuration may be immediately updated according to the new settings. The changes are not guaranteed to take effect unless the client requests a new stream URI and restarts any affected stream. NVC methods for changing a running stream are out of scope for this specification.</wsdl:documentation>
-			<wsdl:input message="trt:SetVideoSourceConfigurationRequest"/>
-			<wsdl:output message="trt:SetVideoSourceConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetVideoEncoderConfiguration">
-			<wsdl:documentation>This operation modifies a video encoder configuration. The ForcePersistence flag indicates if the changes shall remain after reboot of the device. Changes in the Multicast settings shall always be persistent. Running streams using this configuration may be immediately updated according to the new settings. The changes are not guaranteed to take effect unless the client requests a new stream URI and restarts any affected stream. NVC methods for changing a running stream are out of scope for this specification. <br/>SessionTimeout is provided as a hint for keeping rtsp session by a device. If necessary the device may adapt parameter values for SessionTimeout elements without returning an error. For the time between keep alive calls the client shall adhere to the timeout value signaled via RTSP.</wsdl:documentation>
-			<wsdl:input message="trt:SetVideoEncoderConfigurationRequest"/>
-			<wsdl:output message="trt:SetVideoEncoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetAudioSourceConfiguration">
-			<wsdl:documentation>This operation modifies an audio source configuration. The ForcePersistence flag indicates if
-the changes shall remain after reboot of the device. Running streams using this configuration
-may be immediately updated according to the new settings. The changes are not guaranteed
-to take effect unless the client requests a new stream URI and restarts any affected stream
-NVC methods for changing a running stream are out of scope for this specification.</wsdl:documentation>
-			<wsdl:input message="trt:SetAudioSourceConfigurationRequest"/>
-			<wsdl:output message="trt:SetAudioSourceConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetAudioEncoderConfiguration">
-			<wsdl:documentation>This operation modifies an audio encoder configuration. The ForcePersistence flag indicates if
-the changes shall remain after reboot of the device. Running streams using this configuration may be immediately updated
-according to the new settings. The changes are not guaranteed to take effect unless the client
-requests a new stream URI and restarts any affected streams. NVC methods for changing a
-running stream are out of scope for this specification.</wsdl:documentation>
-			<wsdl:input message="trt:SetAudioEncoderConfigurationRequest"/>
-			<wsdl:output message="trt:SetAudioEncoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetVideoAnalyticsConfiguration">
-			<wsdl:documentation>A video analytics configuration is modified using this command. The ForcePersistence flag
-indicates if the changes shall remain after reboot of the device or not. Running streams using
-this configuration shall be immediately updated according to the new settings. Otherwise
-inconsistencies can occur between the scene description processed by the rule engine and
-the notifications produced by analytics engine and rule engine which reference the very same
-video analytics configuration token.</wsdl:documentation>
-			<wsdl:input message="trt:SetVideoAnalyticsConfigurationRequest"/>
-			<wsdl:output message="trt:SetVideoAnalyticsConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetMetadataConfiguration">
-			<wsdl:documentation>This operation modifies a metadata configuration. The ForcePersistence flag indicates if the
-changes shall remain after reboot of the device. Changes in the Multicast settings shall
-always be persistent. Running streams using this configuration may be updated immediately
-according to the new settings. The changes are not guaranteed to take effect unless the client
-requests a new stream URI and restarts any affected streams. NVC methods for changing a
-running stream are out of scope for this specification.</wsdl:documentation>
-			<wsdl:input message="trt:SetMetadataConfigurationRequest"/>
-			<wsdl:output message="trt:SetMetadataConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetAudioOutputConfiguration">
-			<wsdl:documentation>This operation modifies an audio output configuration. The ForcePersistence flag indicates if
-the changes shall remain after reboot of the device.</wsdl:documentation>
-			<wsdl:input message="trt:SetAudioOutputConfigurationRequest"/>
-			<wsdl:output message="trt:SetAudioOutputConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetAudioDecoderConfiguration">
-			<wsdl:documentation>This operation modifies an audio decoder configuration. The ForcePersistence flag indicates if
-the changes shall remain after reboot of the device.</wsdl:documentation>
-			<wsdl:input message="trt:SetAudioDecoderConfigurationRequest"/>
-			<wsdl:output message="trt:SetAudioDecoderConfigurationResponse"/>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetVideoSourceConfigurationOptions">
-			<wsdl:documentation>This operation returns the available options  (supported values and ranges for video source configuration parameters) when the video source parameters are
-reconfigured If a video source configuration is specified, the options shall concern that
-particular configuration. If a media profile is specified, the options shall be compatible with
-that media profile.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoSourceConfigurationOptionsRequest"/>
-			<wsdl:output message="trt:GetVideoSourceConfigurationOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoEncoderConfigurationOptions">
-			<wsdl:documentation>This operation returns the available options (supported values and ranges for video encoder 
-				configuration parameters) when the video encoder parameters are reconfigured. <br/>
-				For JPEG, MPEG4 and H264 extension elements have been defined that provide additional information. A device must provide the 
-				XxxOption information for all encodings supported and should additionally provide the corresponding XxxOption2 information.<br/>
-				This response contains the available video encoder configuration options. If a video encoder configuration is specified, 
-				the options shall concern that particular configuration. If a media profile is specified, the options shall be 
-				compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.
-			</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoEncoderConfigurationOptionsRequest"/>
-			<wsdl:output message="trt:GetVideoEncoderConfigurationOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioSourceConfigurationOptions">
-			<wsdl:documentation>This operation returns the available options (supported values and ranges for audio source configuration parameters) when the audio source parameters are
-reconfigured. If an audio source configuration is specified, the options shall concern that
-particular configuration. If a media profile is specified, the options shall be compatible with
-that media profile.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioSourceConfigurationOptionsRequest"/>
-			<wsdl:output message="trt:GetAudioSourceConfigurationOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioEncoderConfigurationOptions">
-			<wsdl:documentation>This operation returns the available options  (supported values and ranges for audio encoder configuration parameters) when the audio encoder parameters are
-reconfigured.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioEncoderConfigurationOptionsRequest"/>
-			<wsdl:output message="trt:GetAudioEncoderConfigurationOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetMetadataConfigurationOptions">
-			<wsdl:documentation>This operation returns the available options (supported values and ranges for metadata configuration parameters) for changing the metadata configuration.</wsdl:documentation>
-			<wsdl:input message="trt:GetMetadataConfigurationOptionsRequest"/>
-			<wsdl:output message="trt:GetMetadataConfigurationOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioOutputConfigurationOptions">
-			<wsdl:documentation>This operation returns the available options (supported values and ranges for audio output configuration parameters) for configuring an audio output.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioOutputConfigurationOptionsRequest"/>
-			<wsdl:output message="trt:GetAudioOutputConfigurationOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioDecoderConfigurationOptions">
-			<wsdl:documentation>This command list the audio decoding capabilities for a given profile and configuration of a
-device.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioDecoderConfigurationOptionsRequest"/>
-			<wsdl:output message="trt:GetAudioDecoderConfigurationOptionsResponse"/>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetGuaranteedNumberOfVideoEncoderInstances">
-			<wsdl:documentation>The GetGuaranteedNumberOfVideoEncoderInstances command can be used to request the
-minimum number of guaranteed video encoder instances (applications) per Video Source
-Configuration.</wsdl:documentation>
-			<wsdl:input message="trt:GetGuaranteedNumberOfVideoEncoderInstancesRequest"/>
-			<wsdl:output message="trt:GetGuaranteedNumberOfVideoEncoderInstancesResponse"/>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetStreamUri">
-			<wsdl:documentation>This operation requests a URI that can be used to initiate a live media stream using RTSP as
-the control protocol. The returned URI shall remain valid indefinitely even if the profile is
-changed. The ValidUntilConnect, ValidUntilReboot and Timeout Parameter shall be set
-accordingly (ValidUntilConnect=false, ValidUntilReboot=false, timeout=PT0S). <br/>
-				The correct syntax for the StreamSetup element for these media stream setups defined in 5.1.1 of the streaming specification are as follows:
-				<ol>
-					<li>RTP unicast over UDP: StreamType = "RTP_unicast", TransportProtocol = "UDP"</li>
-					<li>RTP over RTSP over HTTP over TCP: StreamType = "RTP_unicast", TransportProtocol = "HTTP"</li>
-					<li>RTP over RTSP over TCP: StreamType = "RTP_unicast", TransportProtocol = "RTSP"</li>
-				</ol>
-				<br/>
-If a multicast stream is requested the VideoEncoderConfiguration, AudioEncoderConfiguration and MetadataConfiguration element inside the corresponding 
-media profile must be configured with valid multicast settings.<br/>
-For full compatibility with other ONVIF services a device should not generate Uris longer than
-128 octets.</wsdl:documentation>
-			<wsdl:input message="trt:GetStreamUriRequest"/>
-			<wsdl:output message="trt:GetStreamUriResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="StartMulticastStreaming">
-			<wsdl:documentation>This command starts multicast streaming using a specified media profile of a device.
-Streaming continues until StopMulticastStreaming is called for the same Profile. The
-streaming shall continue after a reboot of the device until a StopMulticastStreaming request is
-received. The multicast address, port and TTL are configured in the
-VideoEncoderConfiguration, AudioEncoderConfiguration and MetadataConfiguration
-respectively.</wsdl:documentation>
-			<wsdl:input message="trt:StartMulticastStreamingRequest"/>
-			<wsdl:output message="trt:StartMulticastStreamingResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="StopMulticastStreaming">
-			<wsdl:documentation>This command stop multicast streaming using a specified media profile of a device</wsdl:documentation>
-			<wsdl:input message="trt:StopMulticastStreamingRequest"/>
-			<wsdl:output message="trt:StopMulticastStreamingResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetSynchronizationPoint">
-			<wsdl:documentation>Synchronization points allow clients to decode and correctly use all data after the
-synchronization point.
-For example, if a video stream is configured with a large I-frame distance and a client loses a
-single packet, the client does not display video until the next I-frame is transmitted. In such
-cases, the client can request a Synchronization Point which enforces the device to add an I-Frame as soon as possible. Clients can request Synchronization Points for profiles. The device
-shall add synchronization points for all streams associated with this profile.
-Similarly, a synchronization point is used to get an update on full PTZ or event status through
-the metadata stream.
-If a video stream is associated with the profile, an I-frame shall be added to this video stream.
-If a PTZ metadata stream is associated to the profile,
-the PTZ position shall be repeated within the metadata stream.</wsdl:documentation>
-			<wsdl:input message="trt:SetSynchronizationPointRequest"/>
-			<wsdl:output message="trt:SetSynchronizationPointResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetSnapshotUri">
-			<wsdl:documentation>A client uses the GetSnapshotUri command to obtain a JPEG snapshot from the
-device. The returned URI shall remain valid indefinitely even if the profile is changed. The
-ValidUntilConnect, ValidUntilReboot and Timeout Parameter shall be set accordingly
-(ValidUntilConnect=false, ValidUntilReboot=false, timeout=PT0S). The URI can be used for
-acquiring a JPEG image through a HTTP GET operation. The image encoding will always be
-JPEG regardless of the encoding setting in the media profile. The Jpeg settings
-(like resolution or quality) may be taken from the profile if suitable. The provided
-image will be updated automatically and independent from calls to GetSnapshotUri.</wsdl:documentation>
-			<wsdl:input message="trt:GetSnapshotUriRequest"/>
-			<wsdl:output message="trt:GetSnapshotUriResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoSourceModes">
-			<wsdl:documentation>A device returns the information for current video source mode and settable video source modes of specified video source. A device that indicates a capability of  VideoSourceModes shall support this command.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoSourceModesRequest"/>
-			<wsdl:output message="trt:GetVideoSourceModesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetVideoSourceMode">
-			<wsdl:documentation>SetVideoSourceMode changes the media profile structure relating to video source for the specified video source mode. A device that indicates a capability of VideoSourceModes shall support this command. The behavior after changing the mode is not defined in this specification.</wsdl:documentation>
-			<wsdl:input message="trt:SetVideoSourceModeRequest"/>
-			<wsdl:output message="trt:SetVideoSourceModeResponse"/>
-		</wsdl:operation>
-		<!--==============OSD Operation Begin=================-->
-		<wsdl:operation name="GetOSDs">
-			<wsdl:documentation>Get the OSDs.</wsdl:documentation>
-			<wsdl:input message="trt:GetOSDsRequest"/>
-			<wsdl:output message="trt:GetOSDsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetOSD">
-			<wsdl:documentation>Get the OSD.</wsdl:documentation>
-			<wsdl:input message="trt:GetOSDRequest"/>
-			<wsdl:output message="trt:GetOSDResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetOSDOptions">
-			<wsdl:documentation>Get the OSD Options.</wsdl:documentation>
-			<wsdl:input message="trt:GetOSDOptionsRequest"/>
-			<wsdl:output message="trt:GetOSDOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetOSD">
-			<wsdl:documentation>Set the OSD</wsdl:documentation>
-			<wsdl:input message="trt:SetOSDRequest"/>
-			<wsdl:output message="trt:SetOSDResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="CreateOSD">
-			<wsdl:documentation>Create the OSD.</wsdl:documentation>
-			<wsdl:input message="trt:CreateOSDRequest"/>
-			<wsdl:output message="trt:CreateOSDResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteOSD">
-			<wsdl:documentation>Delete the OSD.</wsdl:documentation>
-			<wsdl:input message="trt:DeleteOSDRequest"/>
-			<wsdl:output message="trt:DeleteOSDResponse"/>
-		</wsdl:operation>
-		<!--==============OSD Operation End=================-->
-	</wsdl:portType>
-	<wsdl:binding name="MediaBinding" type="trt:Media">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<!--===============================-->
-		<!--===============================-->
-		<wsdl:operation name="GetServiceCapabilities">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetServiceCapabilities"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetVideoSources">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdlGetVideoSources/"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<!--===============================-->
-		<wsdl:operation name="GetAudioSources">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioSources"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetAudioOutputs">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioOutputs"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="CreateProfile">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/CreateProfile"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetProfile">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdlGetProfile/"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetProfiles">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetProfiles"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddVideoEncoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddVideoEncoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddVideoSourceConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddVideoSourceConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddAudioEncoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddAudioEncoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddAudioSourceConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddAudioSourceConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddPTZConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddPTZConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddVideoAnalyticsConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddVideoAnalyticsConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddMetadataConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddMetadataConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddAudioOutputConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddAudioOutputConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddAudioDecoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddAudioDecoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemoveVideoEncoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveVideoEncoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemoveVideoSourceConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveVideoSourceConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemoveAudioEncoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveAudioEncoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemoveAudioSourceConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveAudioSourceConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemovePTZConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemovePTZConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemoveVideoAnalyticsConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveVideoAnalyticsConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemoveMetadataConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveMetadataConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemoveAudioOutputConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveAudioOutputConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemoveAudioDecoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveAudioDecoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="DeleteProfile">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/DeleteProfile"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<!--===============================-->
-		<!--===============================-->
-		<wsdl:operation name="GetVideoSourceConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoSourceConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoEncoderConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoEncoderConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioSourceConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdlGetAudioSourceConfigurations/"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioEncoderConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioEncoderConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoAnalyticsConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoAnalyticsConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetMetadataConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetMetadataConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioOutputConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioOutputConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioDecoderConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioDecoderConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetVideoSourceConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoSourceConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoEncoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoEncoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioSourceConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioSourceConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioEncoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioEncoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoAnalyticsConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoAnalyticsConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetMetadataConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetMetadataConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioOutputConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioOutputConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioDecoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioDecoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetCompatibleVideoEncoderConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleVideoEncoderConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleVideoSourceConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleVideoSourceConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleAudioEncoderConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioEncoderConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleAudioSourceConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioSourceConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleVideoAnalyticsConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleVideoAnalyticsConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleMetadataConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleMetadataConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleAudioOutputConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioOutputConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleAudioDecoderConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioDecoderConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="SetVideoSourceConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetVideoSourceConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetVideoEncoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetVideoEncoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetAudioSourceConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetAudioSourceConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetAudioEncoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetAudioEncoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetVideoAnalyticsConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetVideoAnalyticsConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetMetadataConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetMetadataConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetAudioOutputConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetAudioOutputConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetAudioDecoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetAudioDecoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetVideoSourceConfigurationOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdlGetVideoSourceConfigurationOptions/"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoEncoderConfigurationOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoEncoderConfigurationOptions"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioSourceConfigurationOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioSourceConfigurationOptions"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioEncoderConfigurationOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioEncoderConfigurationOptions"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetMetadataConfigurationOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetMetadataConfigurationOptions"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioOutputConfigurationOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioOutputConfigurationOptions"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioDecoderConfigurationOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioDecoderConfigurationOptions"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetGuaranteedNumberOfVideoEncoderInstances">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetGuaranteedNumberOfVideoEncoderInstances"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<!--===============================-->
-		<!--===============================-->
-		<wsdl:operation name="GetStreamUri">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetStreamUri"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="StartMulticastStreaming">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/StartMulticastStreaming"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="StopMulticastStreaming">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/StopMulticastStreaming"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="SetSynchronizationPoint">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetSynchronizationPoint"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetSnapshotUri">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetSnapshotUri"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetVideoSourceModes">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoSourceModes"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="SetVideoSourceMode">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetVideoSourceMode"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<!--==============OSD Operation Begin=================-->
-		<wsdl:operation name="GetOSDs">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetOSDs"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetOSD">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetOSD"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetOSDOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetOSDOptions"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetOSD">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetOSD"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="CreateOSD">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/CreateOSD"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteOSD">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/DeleteOSD"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--==============OSD Operation End=================-->
-	</wsdl:binding>
-</wsdl:definitions>
diff --git a/src/onvif_srvd/onvif_srvd/wsdl/onvif.xsd b/src/onvif_srvd/onvif_srvd/wsdl/onvif.xsd
deleted file mode 100644
index 64852d8..0000000
--- a/src/onvif_srvd/onvif_srvd/wsdl/onvif.xsd
+++ /dev/null
@@ -1,8822 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--<?xml-stylesheet type="text/xsl" href="onvif-schema-viewer.xsl"?>-->
-<!--
-Copyright (c) 2008-2016 by ONVIF: Open Network Video Interface Forum. All rights reserved.
-
-Recipients of this document may copy, distribute, publish, or display this document so long as this copyright notice, license and disclaimer are retained with all copies of the document. No license is granted to modify this document.
-
-THIS DOCUMENT IS PROVIDED "AS IS," AND THE CORPORATION AND ITS MEMBERS AND THEIR AFFILIATES, MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THIS DOCUMENT ARE SUITABLE FOR ANY PURPOSE; OR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT, WHETHER OR NOT (1) THE CORPORATION, MEMBERS OR THEIR AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR (2) SUCH DAMAGES WERE REASONABLY FORESEEABLE, AND ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT.  THE FOREGOING DISCLAIMER AND LIMITATION ON LIABILITY DO NOT APPLY TO, INVALIDATE, OR LIMIT REPRESENTATIONS AND WARRANTIES MADE BY THE MEMBERS AND THEIR RESPECTIVE AFFILIATES TO THE CORPORATION AND OTHER MEMBERS IN CERTAIN WRITTEN POLICIES OF THE CORPORATION.
--->
-<xs:schema xmlns:tt="http://www.onvif.org/ver10/schema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2" xmlns:xop="http://www.w3.org/2004/08/xop/include" xmlns:soapenv="http://www.w3.org/2003/05/soap-envelope" targetNamespace="http://www.onvif.org/ver10/schema" elementFormDefault="qualified" version="16.12">
-	<xs:include schemaLocation="common.xsd"/>
-	<xs:import namespace="http://www.w3.org/2005/05/xmlmime" schemaLocation="http://www.w3.org/2005/05/xmlmime"/>
-	<xs:import namespace="http://www.w3.org/2003/05/soap-envelope" schemaLocation="http://www.w3.org/2003/05/soap-envelope"/>
-	<xs:import namespace="http://docs.oasis-open.org/wsn/b-2" schemaLocation="http://docs.oasis-open.org/wsn/b-2.xsd"/>
-	<xs:import namespace="http://www.w3.org/2004/08/xop/include" schemaLocation="http://www.w3.org/2004/08/xop/include"/>
-	<!--===============================-->
-	<!--         Generic Types         -->
-	<!--===============================-->
-	<xs:complexType name="DeviceEntity">
-		<xs:annotation>
-			<xs:documentation>Base class for physical entities like inputs and outputs.</xs:documentation>
-		</xs:annotation>
-		<xs:attribute name="token" type="tt:ReferenceToken" use="required">
-			<xs:annotation>
-				<xs:documentation>Unique identifier referencing the physical entity.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ReferenceToken">
-		<xs:annotation>
-			<xs:documentation>Unique identifier for a physical or logical resource.
-			Tokens should be assigned such that they are unique within a device. Tokens must be at least unique within its class.
-			Length up to 64 characters.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:maxLength value="64"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Name">
-		<xs:annotation>
-			<xs:documentation>User readable name. Length up to 64 characters.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:maxLength value="64"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="IntRectangle">
-		<xs:annotation>
-			<xs:documentation>Rectangle defined by lower left corner position and size. Units are pixel.</xs:documentation>
-		</xs:annotation>
-		<xs:attribute name="x" type="xs:int" use="required"/>
-		<xs:attribute name="y" type="xs:int" use="required"/>
-		<xs:attribute name="width" type="xs:int" use="required"/>
-		<xs:attribute name="height" type="xs:int" use="required"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IntRectangleRange">
-		<xs:annotation>
-			<xs:documentation>Range of a rectangle. The rectangle itself is defined by lower left corner position and size. Units are pixel.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="XRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Range of X-axis.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="YRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Range of Y-axis.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WidthRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Range of width.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="HeightRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Range of height.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IntRange">
-		<xs:annotation>
-			<xs:documentation>Range of values greater equal Min value and less equal Max value.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Min" type="xs:int"/>
-			<xs:element name="Max" type="xs:int"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FloatRange">
-		<xs:annotation>
-			<xs:documentation>Range of values greater equal Min value and less equal Max value.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Min" type="xs:float"/>
-			<xs:element name="Max" type="xs:float"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DurationRange">
-		<xs:annotation>
-			<xs:documentation>Range of duration greater equal Min duration and less equal Max duration.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Min" type="xs:duration"/>
-			<xs:element name="Max" type="xs:duration"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IntList">
-		<xs:annotation>
-			<xs:documentation>List of values.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Items" type="xs:int" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="IntAttrList">
-		<xs:list itemType="xs:int"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="FloatAttrList">
-		<xs:list itemType="xs:float"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="StringAttrList">
-		<xs:list itemType="xs:string"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="ReferenceTokenList">
-		<xs:list itemType="tt:ReferenceToken"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="FloatList">
-		<xs:sequence>
-			<xs:element name="Items" type="xs:float" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnyHolder">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--      End, Generic Types       -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--      Media Related Types      -->
-	<!--===============================-->
-	<xs:complexType name="VideoSource">
-		<xs:annotation>
-			<xs:documentation>Representation of a physical video input.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Framerate" type="xs:float">
-						<xs:annotation>
-							<xs:documentation>Frame rate in frames per second.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Resolution" type="tt:VideoResolution">
-						<xs:annotation>
-							<xs:documentation>Horizontal and vertical resolution</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Imaging" type="tt:ImagingSettings" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optional configuration of the image sensor.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:VideoSourceExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Imaging" type="tt:ImagingSettings20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the image sensor. To be used if imaging service 2.00 is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoSourceExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioSource">
-		<xs:annotation>
-			<xs:documentation>Representation of a physical audio input.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Channels" type="xs:int">
-						<xs:annotation>
-							<xs:documentation>number of available audio channels. (1: mono, 2: stereo) </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Profile">
-		<xs:annotation>
-			<xs:documentation>
-			A media profile consists of a set of media configurations. Media profiles are used by a client
-			to configure properties of a media stream from an NVT.<br/>
-			An NVT shall provide at least one media profile at boot. An NVT should provide “ready to use”
-			profiles for the most common media configurations that the device offers.<br/>
-			A profile consists of a set of interconnected configuration entities. Configurations are provided
-			by the NVT and can be either static or created dynamically by the NVT. For example, the
-			dynamic configurations can be created by the NVT depending on current available encoding
-			resources.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Name" type="tt:Name">
-				<xs:annotation>
-					<xs:documentation>User readable name of the profile.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoSourceConfiguration" type="tt:VideoSourceConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Video input.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioSourceConfiguration" type="tt:AudioSourceConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Audio input.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoEncoderConfiguration" type="tt:VideoEncoderConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Video encoder.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioEncoderConfiguration" type="tt:AudioEncoderConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Audio encoder.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoAnalyticsConfiguration" type="tt:VideoAnalyticsConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the video analytics module and rule engine.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PTZConfiguration" type="tt:PTZConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the pan tilt zoom unit.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MetadataConfiguration" type="tt:MetadataConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the metadata stream.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ProfileExtension" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Extensions defined in ONVIF 2.0</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="token" type="tt:ReferenceToken" use="required">
-			<xs:annotation>
-				<xs:documentation>Unique identifier of the profile.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="fixed" type="xs:boolean">
-			<xs:annotation>
-				<xs:documentation>A value of true signals that the profile cannot be deleted. Default is false.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ProfileExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="AudioOutputConfiguration" type="tt:AudioOutputConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Audio output.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioDecoderConfiguration" type="tt:AudioDecoderConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Audio decoder.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ProfileExtension2" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ProfileExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:element name="VideoSourceConfiguration" type="tt:VideoSourceConfiguration"/>
-	<xs:element name="AudioSourceConfiguration" type="tt:AudioSourceConfiguration"/>
-	<xs:element name="VideoEncoderConfiguration" type="tt:VideoEncoderConfiguration"/>
-	<xs:element name="AudioEncoderConfiguration" type="tt:AudioEncoderConfiguration"/>
-	<xs:element name="VideoAnalyticsConfiguration" type="tt:VideoAnalyticsConfiguration"/>
-	<xs:element name="PTZConfiguration" type="tt:PTZConfiguration"/>
-	<xs:element name="MetadataConfiguration" type="tt:MetadataConfiguration"/>
-	<xs:element name="AudioOutputConfiguration" type="tt:AudioOutputConfiguration"/>
-	<xs:element name="AudioDecoderConfiguration" type="tt:AudioDecoderConfiguration"/>
-	<!--===============================-->
-	<xs:complexType name="ConfigurationEntity">
-		<xs:annotation>
-			<xs:documentation>Base type defining the common properties of a configuration.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Name" type="tt:Name">
-				<xs:annotation>
-					<xs:documentation>User readable name. Length up to 64 characters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="UseCount" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Number of internal references currently using this configuration. <br/>This informational parameter is read-only. Deprecated for Media2 Service.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="token" type="tt:ReferenceToken" use="required">
-			<xs:annotation>
-				<xs:documentation>Token that uniquely refernces this configuration. Length up to 64 characters.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   VideoSourceConfiguration   -->
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="SourceToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Reference to the physical input.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Bounds" type="tt:IntRectangle">
-						<xs:annotation>
-							<xs:documentation>Rectangle specifying the Video capturing area. The capturing area shall not be larger than the whole Video source area.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="Extension" type="tt:VideoSourceConfigurationExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfigurationExtension">
-		<xs:sequence>
-			<xs:element name="Rotate" type="tt:Rotate" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure rotation of captured image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoSourceConfigurationExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfigurationExtension2">
-		<xs:sequence>
-			<xs:element name="LensDescription" type="tt:LensDescription" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="SceneOrientation" type="tt:SceneOrientation" minOccurs="0" maxOccurs="1" />
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Rotate">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:RotateMode">
-				<xs:annotation>
-					<xs:documentation>Parameter to enable/disable Rotation feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Degree" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to configure how much degree of clockwise rotation of image  for On mode. Omitting this parameter for On mode means 180 degree rotation.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RotateExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RotateExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="RotateMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="ON"/>
-			<xs:enumeration value="AUTO"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="LensProjection">
-		<xs:sequence>
-			<xs:element name="Angle" type="xs:float">
-				<xs:annotation><xs:documentation>Angle of incidence.</xs:documentation></xs:annotation>
-			</xs:element>
-			<xs:element name="Radius" type="xs:float">
-				<xs:annotation><xs:documentation>Mapping radius as a consequence of the emergent angle.</xs:documentation></xs:annotation>
-			</xs:element>
-			<xs:element name="Transmittance" type="xs:float" minOccurs="0">
-				<xs:annotation><xs:documentation>Optional ray absorption at the given angle due to vignetting. A value of one means no absorption.</xs:documentation></xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first ONVIF then Vendor -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="LensOffset">
-		<xs:attribute name="x" type="xs:float">
-			<xs:annotation><xs:documentation>Optional horizontal offset of the lens center in normalized coordinates.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="y" type="xs:float">
-			<xs:annotation><xs:documentation>Optional vertical offset of the lens center in normalized coordinates.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="LensDescription">
-		<xs:sequence>
-			<xs:element name="Offset" type="tt:LensOffset"/>
-			<xs:element name="Projection" type="tt:LensProjection" maxOccurs="unbounded"/>
-			<xs:element name="XFactor" type="xs:float"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first ONVIF then Vendor -->
-		</xs:sequence>
-		<xs:attribute name="FocalLength" type="xs:float">
-			<xs:annotation><xs:documentation>Optional focal length of the optical system.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="BoundsRange" type="tt:IntRectangleRange">
-				<xs:annotation>
-					<xs:documentation>Supported range for the capturing area.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoSourceTokensAvailable" type="tt:ReferenceToken" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of physical inputs.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoSourceConfigurationOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfigurationOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Rotate" type="tt:RotateOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Options of parameters for Rotation feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoSourceConfigurationOptionsExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfigurationOptionsExtension2">
-		<xs:sequence>
-			<xs:element name="SceneOrientationMode" type="tt:SceneOrientationMode" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Scene orientation modes supported by the device for this configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RotateOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:RotateMode" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Supported options of Rotate mode parameter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DegreeList" type="tt:IntList" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>List of supported degree value for rotation.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RotateOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RotateOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--    Scene Orientation    -->
-	<!--===============================-->
-	<xs:simpleType name="SceneOrientationMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="MANUAL" />
-			<xs:enumeration value="AUTO" />
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="SceneOrientationOption">
-		<xs:restriction base="xs:string">
-			<xs:annotation>
-				<xs:documentation>
-					Defines the acceptable values for the Orientation element of the SceneOrientation type
-				</xs:documentation>
-			</xs:annotation>
-			<xs:enumeration value="Below" />
-			<xs:enumeration value="Horizon" />
-			<xs:enumeration value="Above" />
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="SceneOrientation">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:SceneOrientationMode">
-				<xs:annotation>
-					<xs:documentation>
-						Parameter to assign the way the camera determines the scene orientation.
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>      
-			<xs:element name="Orientation" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-						Assigned or determined scene orientation based on the Mode. When assigning the Mode to AUTO, this field 
-						is optional and will be ignored by the device. When assigning the Mode to MANUAL, this field is required 
-						and the device will return an InvalidArgs fault if missing. 
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>      
-		</xs:sequence>
-	</xs:complexType>  
-	<!--===============================-->
-	<!--   VideoEncoderConfiguration   -->
-	<!--===============================-->
-	<xs:complexType name="VideoEncoderConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="Encoding" type="tt:VideoEncoding">
-						<xs:annotation>
-							<xs:documentation>Used video codec, either Jpeg, H.264 or Mpeg4</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Resolution" type="tt:VideoResolution">
-						<xs:annotation>
-							<xs:documentation>Configured video resolution</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Quality" type="xs:float">
-						<xs:annotation>
-							<xs:documentation>Relative value for the video quantizers and the quality of the video. A high value within supported quality range means higher quality</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="RateControl" type="tt:VideoRateControl" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optional element to configure rate control related parameters.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="MPEG4" type="tt:Mpeg4Configuration" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optional element to configure Mpeg4 related parameters.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="H264" type="tt:H264Configuration" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optional element to configure H.264 related parameters.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Multicast" type="tt:MulticastConfiguration">
-						<xs:annotation>
-							<xs:documentation>Defines the multicast settings that could be used for video streaming.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SessionTimeout" type="xs:duration">
-						<xs:annotation>
-							<xs:documentation>The rtsp session timeout for the related video stream</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="VideoEncoding">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="JPEG"/>
-			<xs:enumeration value="MPEG4"/>
-			<xs:enumeration value="H264"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Mpeg4Profile">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="SP"/>
-			<xs:enumeration value="ASP"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="H264Profile">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Baseline"/>
-			<xs:enumeration value="Main"/>
-			<xs:enumeration value="Extended"/>
-			<xs:enumeration value="High"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="VideoResolution">
-		<xs:sequence>
-			<xs:element name="Width" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Number of the columns of the Video image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Height" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Number of the lines of the Video image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoRateControl">
-		<xs:sequence>
-			<xs:element name="FrameRateLimit" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Maximum output framerate in fps. If an EncodingInterval is provided the resulting encoded framerate will be reduced by the given factor.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EncodingInterval" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Interval at which images are encoded and transmitted. (A value of 1 means that every frame is encoded, a value of 2 means that every 2nd frame is encoded ...)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BitrateLimit" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>the maximum output bitrate in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Mpeg4Configuration">
-		<xs:sequence>
-			<xs:element name="GovLength" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Determines the interval in which the I-Frames will be coded. An entry of 1 indicates I-Frames are continuously generated. An entry of 2 indicates that every 2nd image is an I-Frame, and 3 only every 3rd frame, etc. The frames in between are coded as P or B Frames.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Mpeg4Profile" type="tt:Mpeg4Profile">
-				<xs:annotation>
-					<xs:documentation>the Mpeg4 profile, either simple profile (SP) or advanced simple profile (ASP)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="H264Configuration">
-		<xs:sequence>
-			<xs:element name="GovLength" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Group of Video frames length. Determines typically the interval in which the I-Frames will be coded. An entry of 1 indicates I-Frames are continuously generated. An entry of 2 indicates that every 2nd image is an I-Frame, and 3 only every 3rd frame, etc. The frames in between are coded as P or B Frames.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="H264Profile" type="tt:H264Profile">
-				<xs:annotation>
-					<xs:documentation>the H.264 profile, either baseline, main, extended or high</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoEncoderConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="QualityRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Range of the quality values. A high value means higher quality.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="JPEG" type="tt:JpegOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional JPEG encoder settings ranges (See also Extension element).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MPEG4" type="tt:Mpeg4Options" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional MPEG-4 encoder settings ranges (See also Extension element).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="H264" type="tt:H264Options" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional H.264 encoder settings ranges (See also Extension element).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoEncoderOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoEncoderOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="JPEG" type="tt:JpegOptions2" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional JPEG encoder settings ranges.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MPEG4" type="tt:Mpeg4Options2" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional MPEG-4 encoder settings ranges.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="H264" type="tt:H264Options2" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional H.264 encoder settings ranges.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoEncoderOptionsExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoEncoderOptionsExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="JpegOptions">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported image sizes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FrameRateRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported frame rate in fps (frames per second).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EncodingIntervalRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported encoding interval range. The encoding interval corresponds to the number of frames devided by the encoded frames. An encoding interval value of "1" means that all frames are encoded.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="JpegOptions2">
-		<xs:complexContent>
-			<xs:extension base="tt:JpegOptions">
-				<xs:sequence>
-					<xs:element name="BitrateRange" type="tt:IntRange">
-						<xs:annotation>
-							<xs:documentation>Supported range of encoded bitrate in kbps.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Mpeg4Options">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported image sizes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="GovLengthRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported group of Video frames length. This value typically corresponds to the I-Frame distance.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FrameRateRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported frame rate in fps (frames per second).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EncodingIntervalRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported encoding interval range. The encoding interval corresponds to the number of frames devided by the encoded frames. An encoding interval value of "1" means that all frames are encoded.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Mpeg4ProfilesSupported" type="tt:Mpeg4Profile" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported MPEG-4 profiles.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Mpeg4Options2">
-		<xs:complexContent>
-			<xs:extension base="tt:Mpeg4Options">
-				<xs:sequence>
-					<xs:element name="BitrateRange" type="tt:IntRange">
-						<xs:annotation>
-							<xs:documentation>Supported range of encoded bitrate in kbps.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="H264Options">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported image sizes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="GovLengthRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported group of Video frames length. This value typically corresponds to the I-Frame distance.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FrameRateRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported frame rate in fps (frames per second).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EncodingIntervalRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported encoding interval range. The encoding interval corresponds to the number of frames devided by the encoded frames. An encoding interval value of "1" means that all frames are encoded.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="H264ProfilesSupported" type="tt:H264Profile" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported H.264 profiles.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="H264Options2">
-		<xs:complexContent>
-			<xs:extension base="tt:H264Options">
-				<xs:sequence>
-					<xs:element name="BitrateRange" type="tt:IntRange">
-						<xs:annotation>
-							<xs:documentation>Supported range of encoded bitrate in kbps.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   VideoEncoder2Configuration   -->
-	<!--===============================-->
-	<xs:simpleType name="VideoEncodingMimeNames">
-		<xs:annotation>
-			<xs:documentation>ONVIF prominent MIME type names as referenced by IANA. See also <a href='http://www.iana.org/assignments/media-types/media-types.xhtml'>IANA Media Types</a>.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="JPEG"/>
-			<xs:enumeration value="MPV4-ES"/>
-			<xs:enumeration value="H264"/>
-			<xs:enumeration value="H265"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="VideoEncodingProfiles">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Simple"/>			<!-- MPEG4 SP -->
-			<xs:enumeration value="AdvancedSimple"/>	<!-- MPEG4 ASP -->
-			<xs:enumeration value="Baseline"/>			<!-- H264 Baseline -->
-			<xs:enumeration value="Main"/>				<!-- H264 Main, H.265 Main -->
-			<xs:enumeration value="Main10"/>			<!-- H265 Main 10 -->
-			<xs:enumeration value="Extended"/>			<!-- H264 Extended -->
-			<xs:enumeration value="High"/>				<!-- H264 High -->
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:complexType name="VideoEncoder2Configuration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="Encoding" type="xs:string">
-						<xs:annotation>
-							<xs:documentation>Mime name of the supported video format. For name definitions see tt:VideoEncodingMimeNames and <a href='http://www.iana.org/assignments/media-types/media-types.xhtml'>IANA Media Types</a>.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Resolution" type="tt:VideoResolution2">
-						<xs:annotation>
-							<xs:documentation>Configured video resolution</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="RateControl" type="tt:VideoRateControl2" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optional element to configure rate control related parameters.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Multicast" type="tt:MulticastConfiguration" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Defines the multicast settings that could be used for video streaming.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Quality" type="xs:float">
-						<xs:annotation>
-							<xs:documentation>Relative value for the video quantizers and the quality of the video. A high value within supported quality range means higher quality</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first ONVIF then Vendor -->
-				</xs:sequence>
-				<xs:attribute name="GovLength" type="xs:int">
-					<xs:annotation>
-						<xs:documentation>Group of Video frames length. Determines typically the interval in which the I-Frames will be coded. An entry of 1 indicates I-Frames are continuously generated. An entry of 2 indicates that every 2nd image is an I-Frame, and 3 only every 3rd frame, etc. The frames in between are coded as P or B Frames.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="Profile" type="xs:string">
-					<xs:annotation>
-						<xs:documentation>The encoder profile as defined in tt:VideoEncodingProfiles.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoResolution2">
-		<xs:sequence>
-			<xs:element name="Width" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Number of the columns of the Video image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Height" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Number of the lines of the Video image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first ONVIF then Vendor -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoRateControl2">
-		<xs:sequence>
-			<xs:element name="FrameRateLimit" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Desired frame rate in fps. The actual rate may be lower due to e.g. performance limitations.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BitrateLimit" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>the maximum output bitrate in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first ONVIF then Vendor -->
-		</xs:sequence>
-		<xs:attribute name="ConstantBitRate" type="xs:boolean">
-			<xs:annotation>
-				<xs:documentation>Enforce constant bitrate.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoEncoder2ConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="Encoding" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Mime name of the supported Video format. For name definitions see tt:VideoEncodingMimeNames and <a href='http://www.iana.org/assignments/media-types/media-types.xhtml'>IANA Media Types</a>.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="QualityRange" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>Range of the quality values. A high value means higher quality.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution2" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported image sizes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BitrateRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported range of encoded bitrate in kbps.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first ONVIF then Vendor -->
-		</xs:sequence>
-		<xs:attribute name="GovLengthRange" type="tt:IntAttrList">
-			<xs:annotation>
-				<xs:documentation>Exactly two values, which define the Lower and Upper bounds for the supported group of Video frames length. These values typically correspond to the I-Frame distance.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="FrameRatesSupported" type="tt:FloatAttrList">
-			<xs:annotation>
-				<xs:documentation>List of supported target frame rates in fps (frames per second). The list shall be sorted with highest values first.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="ProfilesSupported" type="tt:StringAttrList">
-			<xs:annotation>
-				<xs:documentation>List of supported encoder profiles as defined in tt::VideoEncodingProfiles.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="ConstantBitRateSupported" type="xs:boolean">
-			<xs:annotation>
-				<xs:documentation>Signal whether enforcing constant bitrate is supported.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--    AudioSourceConfiguration   -->
-	<!--===============================-->
-	<xs:complexType name="AudioSourceConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="SourceToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Token of the Audio Source the configuration applies to</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioSourceConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="InputTokensAvailable" type="tt:ReferenceToken" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Tokens of the audio source the configuration can be used for.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:AudioSourceOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioSourceOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   AudioEncoderConfiguration   -->
-	<!--===============================-->
-	<xs:complexType name="AudioEncoderConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="Encoding" type="tt:AudioEncoding">
-						<xs:annotation>
-							<xs:documentation>Audio codec used for encoding the audio input (either G.711, G.726 or AAC)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Bitrate" type="xs:int">
-						<xs:annotation>
-							<xs:documentation>The output bitrate in kbps.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SampleRate" type="xs:int">
-						<xs:annotation>
-							<xs:documentation>The output sample rate in kHz.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Multicast" type="tt:MulticastConfiguration">
-						<xs:annotation>
-							<xs:documentation>Defines the multicast settings that could be used for video streaming.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SessionTimeout" type="xs:duration">
-						<xs:annotation>
-							<xs:documentation>The rtsp session timeout for the related audio stream</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="AudioEncoding">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="G711"/>
-			<xs:enumeration value="G726"/>
-			<xs:enumeration value="AAC"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="AudioEncoderConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="Options" type="tt:AudioEncoderConfigurationOption" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>list of supported AudioEncoderConfigurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioEncoderConfigurationOption">
-		<xs:sequence>
-			<xs:element name="Encoding" type="tt:AudioEncoding">
-				<xs:annotation>
-					<xs:documentation>The enoding used for audio data (either G.711, G.726 or AAC)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BitrateList" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported bitrates in kbps for the specified Encoding</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SampleRateList" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported Sample Rates in kHz for the specified Encoding</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   AudioEncoder2Configuration   -->
-	<!--===============================-->
-	<xs:simpleType name="AudioEncodingMimeNames">
-		<xs:annotation>
-			<xs:documentation>ONVIF prominent MIME type names as referenced by IANA. See also <a href='http://www.iana.org/assignments/media-types/media-types.xhtml'>IANA Media Types</a> .</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="PCMU"/>		<!-- G.711 uLaw -->
-			<xs:enumeration value="G726"/>
-			<xs:enumeration value="MP4A-LATM"/>		<!-- AAC -->
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:complexType name="AudioEncoder2Configuration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="Encoding" type="xs:string">
-						<xs:annotation>
-							<xs:documentation>Mime name of the supported audio format. For definitions see tt:AudioEncodingMimeNames and <a href='http://www.iana.org/assignments/media-types/media-types.xhtml'>IANA Media Types</a>.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Multicast" type="tt:MulticastConfiguration" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optional multicast configuration of the audio stream.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Bitrate" type="xs:int">
-						<xs:annotation>
-							<xs:documentation>The output bitrate in kbps.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SampleRate" type="xs:int">
-						<xs:annotation>
-							<xs:documentation>The output sample rate in kHz.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first ONVIF then Vendor -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioEncoder2ConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="Encoding" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Mime name of the supported audio format. For definitions see tt:AudioEncodingMimeNames and <a href='http://www.iana.org/assignments/media-types/media-types.xhtml'>IANA Media Types</a>.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BitrateList" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported bitrates in kbps for the specified Encoding</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SampleRateList" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported Sample Rates in kHz for the specified Encoding</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first ONVIF then Vendor -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--  VideoAnalyticsConfiguration  -->
-	<!--===============================-->
-	<xs:complexType name="VideoAnalyticsConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="AnalyticsEngineConfiguration" type="tt:AnalyticsEngineConfiguration"/>
-					<xs:element name="RuleEngineConfiguration" type="tt:RuleEngineConfiguration"/>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--    MetadataConfiguration      -->
-	<!--===============================-->
-	<xs:complexType name="MetadataConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="PTZStatus" type="tt:PTZFilter" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>optional element to configure which PTZ related data is to include in the metadata stream</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Events" type="tt:EventSubscription" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optional element to configure the streaming of events. A client might be interested in receiving all, 
-								none or some of the events produced by the device:<ul>
-									<li>To get all events: Include the Events element but do not include a filter.</li>
-									<li>To get no events: Do not include the Events element.</li>
-									<li>To get only some events: Include the Events element and include a filter in the element.</li>
-								</ul>
-							</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Analytics" type="xs:boolean" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Defines whether the streamed metadata will include metadata from the analytics engines (video, cell motion, audio etc.)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Multicast" type="tt:MulticastConfiguration">
-						<xs:annotation>
-							<xs:documentation>Defines the multicast settings that could be used for video streaming.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SessionTimeout" type="xs:duration">
-						<xs:annotation>
-							<xs:documentation>The rtsp session timeout for the related audio stream (when using Media2 Service, this value is deprecated and ignored)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="AnalyticsEngineConfiguration" type="tt:AnalyticsEngineConfiguration" minOccurs="0"/>
-					<xs:element name="Extension" type="tt:MetadataConfigurationExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:attribute name="CompressionType" type="xs:string">
-					<xs:annotation>
-						<xs:documentation>Optional parameter to configure compression type of Metadata payload. Use values from enumeration MetadataCompressionType.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZFilter">
-		<xs:sequence>
-			<xs:element name="Status" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>True if the metadata stream shall contain the PTZ status (IDLE, MOVING or UNKNOWN)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Position" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>True if the metadata stream shall contain the PTZ position</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EventSubscription">
-		<xs:annotation>
-			<xs:documentation>Subcription handling in the same way as base notification subscription.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Filter" type="wsnt:FilterType" minOccurs="0"/>
-			<xs:element name="SubscriptionPolicy" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="PTZStatusFilterOptions" type="tt:PTZStatusFilterOptions"/>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name ="Extension" type="tt:MetadataConfigurationOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataConfigurationOptionsExtension">
-		<xs:sequence>
-			<xs:element name="CompressionType" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported metadata compression type. Its options shall be chosen from tt:MetadataCompressionType.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:MetadataConfigurationOptionsExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataConfigurationOptionsExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="MetadataCompressionType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="None"/>
-			<xs:enumeration value="GZIP"/>
-			<xs:enumeration value="EXI"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="PTZStatusFilterOptions">
-		<xs:sequence>
-			<xs:element name="PanTiltStatusSupported" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>True if the device is able to stream pan or tilt status information.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ZoomStatusSupported" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>True if the device is able to stream zoom status inforamtion.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="PanTiltPositionSupported" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>True if the device is able to stream the pan or tilt position.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ZoomPositionSupported" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>True if the device is able to stream zoom position information.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZStatusFilterOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZStatusFilterOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          VideoOutput            -->
-	<!--===============================-->
-	<xs:complexType name="VideoOutput">
-		<xs:annotation>
-			<xs:documentation>Representation of a physical video outputs.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Layout" type="tt:Layout"/>
-					<xs:element name="Resolution" type="tt:VideoResolution" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Resolution of the display in Pixel.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="RefreshRate" type="xs:float" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Refresh rate of the display in Hertz.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AspectRatio" type="xs:float" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Aspect ratio of the display as physical extent of width divided by height.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:VideoOutputExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoOutputExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          VideoOutputConfiguration            -->
-	<!--===============================-->
-	<xs:complexType name="VideoOutputConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="OutputToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Token of the Video Output the configuration applies to</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          VideoOutputConfigurationOptions            -->
-	<!--===============================-->
-	<xs:complexType name="VideoOutputConfigurationOptions">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          VideoDecoderConfigurationOptions            -->
-	<!--===============================-->
-	<xs:complexType name="VideoDecoderConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="JpegDecOptions" type="tt:JpegDecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode Jpeg streams this element describes the supported codecs and configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="H264DecOptions" type="tt:H264DecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode H.264 streams this element describes the supported codecs and configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Mpeg4DecOptions" type="tt:Mpeg4DecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode Mpeg4 streams this element describes the supported codecs and configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoDecoderConfigurationOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="H264DecOptions">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported H.264 Video Resolutions</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedH264Profiles" type="tt:H264Profile" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported H264 Profiles (either baseline, main, extended or high) </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedInputBitrate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported H.264 bitrate range in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedFrameRate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported H.264 framerate range in fps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="JpegDecOptions">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported Jpeg Video Resolutions</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedInputBitrate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported Jpeg bitrate range in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedFrameRate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported Jpeg framerate range in fps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Mpeg4DecOptions">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported Mpeg4 Video Resolutions</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedMpeg4Profiles" type="tt:Mpeg4Profile" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported Mpeg4 Profiles (either SP or ASP) </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedInputBitrate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported Mpeg4 bitrate range in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedFrameRate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported Mpeg4 framerate range in fps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoDecoderConfigurationOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          AudioOutputs            -->
-	<!--===============================-->
-	<xs:complexType name="AudioOutput">
-		<xs:annotation>
-			<xs:documentation>Representation of a physical audio outputs.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          AudioOutputConfiguration            -->
-	<!--===============================-->
-	<xs:complexType name="AudioOutputConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="OutputToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Token of the phsycial Audio output.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SendPrimacy" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-						An audio channel MAY support different types of audio transmission. While for full duplex
-						operation no special handling is required, in half duplex operation the transmission direction
-						needs to be switched.
-						The optional SendPrimacy parameter inside the AudioOutputConfiguration indicates which
-						direction is currently active. An NVC can switch between different modes by setting the
-						AudioOutputConfiguration.<br/>
-						The following modes for the Send-Primacy are defined:<ul>
-									<li>www.onvif.org/ver20/HalfDuplex/Server
-						The server is allowed to send audio data to the client. The client shall not send
-						audio data via the backchannel to the NVT in this mode.</li>
-									<li>www.onvif.org/ver20/HalfDuplex/Client
-						The client is allowed to send audio data via the backchannel to the server. The
-						NVT shall not send audio data to the client in this mode.</li>
-									<li>www.onvif.org/ver20/HalfDuplex/Auto
-							It is up to the device how to deal with sending and receiving audio data.</li>
-								</ul>
-						Acoustic echo cancellation is out of ONVIF scope.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="OutputLevel" type="xs:int">
-						<xs:annotation>
-							<xs:documentation>Volume setting of the output. The applicable range is defined via the option AudioOutputOptions.OutputLevelRange.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          AudioOutputConfigurationOptions            -->
-	<!--===============================-->
-	<xs:complexType name="AudioOutputConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="OutputTokensAvailable" type="tt:ReferenceToken" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Tokens of the physical Audio outputs (typically one).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SendPrimacyOptions" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				An <b>audio</b> channel MAY support different types of audio transmission. While for full duplex
-				operation no special handling is required, in half duplex operation the transmission direction
-				needs to be switched.
-				The optional SendPrimacy parameter inside the AudioOutputConfiguration indicates which
-				direction is currently active. An NVC can switch between different modes by setting the
-				AudioOutputConfiguration.<br/>
-				The following modes for the Send-Primacy are defined:<ul>
-							<li>www.onvif.org/ver20/HalfDuplex/Server
-						The server is allowed to send audio data to the client. The client shall not send
-						audio data via the backchannel to the NVT in this mode.</li>
-							<li>www.onvif.org/ver20/HalfDuplex/Client
-						The client is allowed to send audio data via the backchannel to the server. The
-						NVT shall not send audio data to the client in this mode.</li>
-							<li>www.onvif.org/ver20/HalfDuplex/Auto
-						It is up to the device how to deal with sending and receiving audio data.</li>
-						</ul>
-				Acoustic echo cancellation is out of ONVIF scope.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="OutputLevelRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Minimum and maximum level range supported for this Output.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          AudioDecoderConfiguration           -->
-	<!--===============================-->
-	<xs:complexType name="AudioDecoderConfiguration">
-		<xs:annotation>
-			<xs:documentation>The Audio Decoder Configuration does not contain any that parameter to configure the
-decoding .A decoder shall decode every data it receives (according to its capabilities).</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          AudioDecoderConfigurationOptions           -->
-	<!--===============================-->
-	<xs:complexType name="AudioDecoderConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="AACDecOptions" type="tt:AACDecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode AAC encoded audio this section describes the supported configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="G711DecOptions" type="tt:G711DecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode G711 encoded audio this section describes the supported configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="G726DecOptions" type="tt:G726DecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode G726 encoded audio this section describes the supported configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:AudioDecoderConfigurationOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="G711DecOptions">
-		<xs:sequence>
-			<xs:element name="Bitrate" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported bitrates in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SampleRateRange" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported sample rates in kHz</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AACDecOptions">
-		<xs:sequence>
-			<xs:element name="Bitrate" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported bitrates in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SampleRateRange" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported sample rates in kHz</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="G726DecOptions">
-		<xs:sequence>
-			<xs:element name="Bitrate" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported bitrates in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SampleRateRange" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported sample rates in kHz</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioDecoderConfigurationOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          Streaming            -->
-	<!--===============================-->
-	<xs:complexType name="MulticastConfiguration">
-		<xs:sequence>
-			<xs:element name="Address" type="tt:IPAddress">
-				<xs:annotation>
-					<xs:documentation>The multicast address (if this address is set to 0 no multicast streaming is enaled)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Port" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The RTP mutlicast destination port. A device may support RTCP. In this case the port value shall be even to allow the corresponding RTCP stream to be mapped to the next higher (odd) destination port number as defined in the RTSP specification.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TTL" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>In case of IPv6 the TTL value is assumed as the hop limit. Note that for IPV6 and administratively scoped IPv4 multicast the primary use for hop limit / TTL is to prevent packets from (endlessly) circulating and not limiting scope. In these cases the address contains the scope.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AutoStart" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Read only property signalling that streaming is persistant. Use the methods StartMulticastStreaming and StopMulticastStreaming to switch its state.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="StreamSetup">
-		<xs:sequence>
-			<xs:element name="Stream" type="tt:StreamType">
-				<xs:annotation>
-					<xs:documentation>Defines if a multicast or unicast stream is requested</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Transport" type="tt:Transport"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="StreamType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="RTP-Unicast"/>
-			<xs:enumeration value="RTP-Multicast"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Transport">
-		<xs:sequence>
-			<xs:element name="Protocol" type="tt:TransportProtocol">
-				<xs:annotation>
-					<xs:documentation>Defines the network protocol for streaming, either UDP=RTP/UDP, RTSP=RTP/RTSP/TCP or HTTP=RTP/RTSP/HTTP/TCP </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Tunnel" type="tt:Transport" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to describe further tunnel options. This element is normally not needed </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="TransportProtocol">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="UDP"/>
-			<xs:enumeration value="TCP">
-				<xs:annotation>
-					<xs:documentation>This value is deprecated.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="RTSP"/>
-			<xs:enumeration value="HTTP"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="MediaUri">
-		<xs:sequence>
-			<xs:element name="Uri" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Stable Uri to be used for requesting the media stream</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="InvalidAfterConnect" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates if the Uri is only valid until the connection is established. The value shall be set to "false".</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="InvalidAfterReboot" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates if the Uri is invalid after a reboot of the device. The value shall be set to "false".</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Timeout" type="xs:duration">
-				<xs:annotation>
-					<xs:documentation>Duration how long the Uri is valid. This parameter shall be set to PT0S to indicate that this stream URI is indefinitely valid even if the profile changes</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   End, Media Related Types    -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--    Discovery Related Types    -->
-	<!--===============================-->
-	<xs:simpleType name="ScopeDefinition">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Fixed"/>
-			<xs:enumeration value="Configurable"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Scope">
-		<xs:sequence>
-			<xs:element name="ScopeDef" type="tt:ScopeDefinition">
-				<xs:annotation>
-					<xs:documentation>Indicates if the scope is fixed or configurable.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ScopeItem" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Scope item URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="DiscoveryMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Discoverable"/>
-			<xs:enumeration value="NonDiscoverable"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<!-- End, Discovery Related Types  -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--     Network Related Types     -->
-	<!--===============================-->
-	<xs:complexType name="NetworkInterface">
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Enabled" type="xs:boolean">
-						<xs:annotation>
-							<xs:documentation>Indicates whether or not an interface is enabled.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Info" type="tt:NetworkInterfaceInfo" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Network interface information</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Link" type="tt:NetworkInterfaceLink" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Link configuration.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="IPv4" type="tt:IPv4NetworkInterface" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>IPv4 network interface configuration.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="IPv6" type="tt:IPv6NetworkInterface" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>IPv6 network interface configuration.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:NetworkInterfaceExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="InterfaceType" type="tt:IANA-IfTypes"/>
-			<xs:element name="Dot3" type="tt:Dot3Configuration" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Extension point prepared for future 802.3 configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Dot11" type="tt:Dot11Configuration" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:NetworkInterfaceExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="NetworkInterfaceConfigPriority">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="31"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Dot3Configuration">
-		<xs:sequence>
-			<!-- Placeholder for 802.3 configuration -->
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceLink">
-		<xs:sequence>
-			<xs:element name="AdminSettings" type="tt:NetworkInterfaceConnectionSetting">
-				<xs:annotation>
-					<xs:documentation>Configured link settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="OperSettings" type="tt:NetworkInterfaceConnectionSetting">
-				<xs:annotation>
-					<xs:documentation>Current active link settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="InterfaceType" type="tt:IANA-IfTypes">
-				<xs:annotation>
-					<xs:documentation>Integer indicating interface type, for example: 6 is ethernet.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceConnectionSetting">
-		<xs:sequence>
-			<xs:element name="AutoNegotiation" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Auto negotiation on/off.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Speed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Duplex" type="tt:Duplex">
-				<xs:annotation>
-					<xs:documentation>Duplex type, Half or Full.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Duplex">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Full"/>
-			<xs:enumeration value="Half"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="IANA-IfTypes">
-		<xs:restriction base="xs:int">
-			<xs:annotation>
-				<xs:documentation>
-				For valid numbers, please refer to http://www.iana.org/assignments/ianaiftype-mib.
-				</xs:documentation>
-			</xs:annotation>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceInfo">
-		<xs:sequence>
-			<xs:element name="Name" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Network interface name, for example eth0.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="HwAddress" type="tt:HwAddress">
-				<xs:annotation>
-					<xs:documentation>Network interface MAC address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MTU" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Maximum transmission unit.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv6NetworkInterface">
-		<xs:sequence>
-			<xs:element name="Enabled" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IPv6 is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Config" type="tt:IPv6Configuration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv6 configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv4NetworkInterface">
-		<xs:sequence>
-			<xs:element name="Enabled" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IPv4 is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Config" type="tt:IPv4Configuration">
-				<xs:annotation>
-					<xs:documentation>IPv4 configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv4Configuration">
-		<xs:sequence>
-			<xs:element name="Manual" type="tt:PrefixedIPv4Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually added IPv4 addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="LinkLocal" type="tt:PrefixedIPv4Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Link local address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FromDHCP" type="tt:PrefixedIPv4Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv4 address configured by using DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DHCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not DHCP is used.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv6Configuration">
-		<xs:sequence>
-			<xs:element name="AcceptRouterAdvert" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether router advertisment is used.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DHCP" type="tt:IPv6DHCPConfiguration">
-				<xs:annotation>
-					<xs:documentation>DHCP configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Manual" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually entered IPv6 addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="LinkLocal" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of link local IPv6 addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FromDHCP" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of IPv6 addresses configured by using DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FromRA" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of IPv6 addresses configured by using router advertisment.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:IPv6ConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv6ConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="IPv6DHCPConfiguration">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Auto"/>
-			<xs:enumeration value="Stateful"/>
-			<xs:enumeration value="Stateless"/>
-			<xs:enumeration value="Off"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="NetworkProtocol">
-		<xs:sequence>
-			<xs:element name="Name" type="tt:NetworkProtocolType">
-				<xs:annotation>
-					<xs:documentation>Network protocol type string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Enabled" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates if the protocol is enabled or not.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Port" type="xs:int" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>The port that is used by the protocol.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NetworkProtocolExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkProtocolExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="NetworkProtocolType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="HTTP"/>
-			<xs:enumeration value="HTTPS"/>
-			<xs:enumeration value="RTSP"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="NetworkHostType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="IPv4"/>
-			<xs:enumeration value="IPv6"/>
-			<xs:enumeration value="DNS"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="NetworkHost">
-		<xs:sequence>
-			<xs:element name="Type" type="tt:NetworkHostType">
-				<xs:annotation>
-					<xs:documentation>Network host type: IPv4, IPv6 or DNS.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv4 address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv6 address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DNSname" type="tt:DNSName" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>DNS name.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NetworkHostExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkHostExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPAddress">
-		<xs:sequence>
-			<xs:element name="Type" type="tt:IPType">
-				<xs:annotation>
-					<xs:documentation>Indicates if the address is an IPv4 or IPv6 address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv4 address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv6 address</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PrefixedIPv4Address">
-		<xs:sequence>
-			<xs:element name="Address" type="tt:IPv4Address">
-				<xs:annotation>
-					<xs:documentation>IPv4 address</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PrefixLength" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Prefix/submask length</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="IPv4Address">
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="PrefixedIPv6Address">
-		<xs:sequence>
-			<xs:element name="Address" type="tt:IPv6Address">
-				<xs:annotation>
-					<xs:documentation>IPv6 address</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PrefixLength" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Prefix/submask length</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="IPv6Address">
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="HwAddress">
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="IPType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="IPv4"/>
-			<xs:enumeration value="IPv6"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="DNSName">
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="HostnameInformation">
-		<xs:sequence>
-			<xs:element name="FromDHCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether the hostname is obtained from DHCP or not.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Name" type="xs:token" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates the hostname.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:HostnameInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="HostnameInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DNSInformation">
-		<xs:sequence>
-			<xs:element name="FromDHCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not DNS information is retrieved from DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SearchDomain" type="xs:token" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Search domain.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DNSFromDHCP" type="tt:IPAddress" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of DNS addresses received from DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DNSManual" type="tt:IPAddress" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually entered DNS addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:DNSInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DNSInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NTPInformation">
-		<xs:sequence>
-			<xs:element name="FromDHCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates if NTP information is to be retrieved by using DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="NTPFromDHCP" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of NTP addresses retrieved by using DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="NTPManual" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually entered NTP addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NTPInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NTPInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Domain">
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="IPAddressFilterType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Allow"/>
-			<xs:enumeration value="Deny"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="DynamicDNSInformation">
-		<xs:sequence>
-			<xs:element name="Type" type="tt:DynamicDNSType">
-				<xs:annotation>
-					<xs:documentation>Dynamic DNS type.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Name" type="tt:DNSName" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>DNS name.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TTL" type="xs:duration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Time to live.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:DynamicDNSInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DynamicDNSInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="DynamicDNSType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="NoUpdate"/>
-			<xs:enumeration value="ClientUpdates"/>
-			<xs:enumeration value="ServerUpdates"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceSetConfiguration">
-		<xs:sequence>
-			<xs:element name="Enabled" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not an interface is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Link" type="tt:NetworkInterfaceConnectionSetting" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Link configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MTU" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Maximum transmission unit.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv4" type="tt:IPv4NetworkInterfaceSetConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv4 network interface configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv6" type="tt:IPv6NetworkInterfaceSetConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv6 network interface configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NetworkInterfaceSetConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceSetConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Dot3" type="tt:Dot3Configuration" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Dot11" type="tt:Dot11Configuration" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:NetworkInterfaceSetConfigurationExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv6NetworkInterfaceSetConfiguration">
-		<xs:sequence>
-			<xs:element name="Enabled" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IPv6 is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AcceptRouterAdvert" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether router advertisment is used.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Manual" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually added IPv6 addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DHCP" type="tt:IPv6DHCPConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>DHCP configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv4NetworkInterfaceSetConfiguration">
-		<xs:sequence>
-			<xs:element name="Enabled" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IPv4 is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Manual" type="tt:PrefixedIPv4Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually added IPv4 addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DHCP" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not DHCP is used.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkGateway">
-		<xs:sequence>
-			<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>IPv4 address string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>IPv6 address string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkZeroConfiguration">
-		<xs:sequence>
-			<xs:element name="InterfaceToken" type="tt:ReferenceToken">
-				<xs:annotation>
-					<xs:documentation>Unique identifier of network interface.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Enabled" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether the zero-configuration is enabled or not.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Addresses" type="tt:IPv4Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>The zero-configuration IPv4 address(es)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NetworkZeroConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkZeroConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Additional" type="tt:NetworkZeroConfiguration" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Optional array holding the configuration for the second and possibly further interfaces.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NetworkZeroConfigurationExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkZeroConfigurationExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPAddressFilter">
-		<xs:sequence>
-			<xs:element name="Type" type="tt:IPAddressFilterType"/>
-			<xs:element name="IPv4Address" type="tt:PrefixedIPv4Address" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="IPv6Address" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:IPAddressFilterExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPAddressFilterExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot11Configuration">
-		<xs:sequence>
-			<xs:element name="SSID" type="tt:Dot11SSIDType"/>
-			<xs:element name="Mode" type="tt:Dot11StationMode"/>
-			<xs:element name="Alias" type="tt:Name"/>
-			<xs:element name="Priority" type="tt:NetworkInterfaceConfigPriority"/>
-			<xs:element name="Security" type="tt:Dot11SecurityConfiguration"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11SSIDType">
-		<xs:restriction base="xs:hexBinary">
-			<xs:minLength value="1"/>
-			<xs:maxLength value="32"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11StationMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Ad-hoc"/>
-			<xs:enumeration value="Infrastructure"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Dot11SecurityConfiguration">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:Dot11SecurityMode"/>
-			<xs:element name="Algorithm" type="tt:Dot11Cipher" minOccurs="0"/>
-			<xs:element name="PSK" type="tt:Dot11PSKSet" minOccurs="0"/>
-			<xs:element name="Dot1X" type="tt:ReferenceToken" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:Dot11SecurityConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot11SecurityConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11SecurityMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="None"/>
-			<xs:enumeration value="WEP"/>
-			<xs:enumeration value="PSK"/>
-			<xs:enumeration value="Dot1X"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11Cipher">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="CCMP"/>
-			<xs:enumeration value="TKIP"/>
-			<xs:enumeration value="Any"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11PSK">
-		<xs:restriction base="xs:hexBinary">
-			<xs:length value="32"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11PSKPassphrase">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[ -~]{8,63}"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Dot11PSKSet">
-		<xs:sequence>
-			<xs:element name="Key" type="tt:Dot11PSK" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-					According to IEEE802.11-2007 H.4.1 the RSNA PSK consists of 256 bits, or 64 octets when represented in hex<br/>
-					Either Key or Passphrase shall be given, if both are supplied Key shall be used by the device and Passphrase ignored.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Passphrase" type="tt:Dot11PSKPassphrase" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-					According to IEEE802.11-2007 H.4.1 a pass-phrase is a sequence of between 8 and 63 ASCII-encoded characters and
-					each character in the pass-phrase must have an encoding in the range of 32 to 126 (decimal),inclusive.<br/>
-					If only Passpharse is supplied the Key shall be derived using the algorithm described in IEEE802.11-2007 section H.4
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:Dot11PSKSetExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot11PSKSetExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceSetConfigurationExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot11Capabilities">
-		<xs:sequence>
-			<xs:element name="TKIP" type="xs:boolean"/>
-			<xs:element name="ScanAvailableNetworks" type="xs:boolean"/>
-			<xs:element name="MultipleConfiguration" type="xs:boolean"/>
-			<xs:element name="AdHocStationMode" type="xs:boolean"/>
-			<xs:element name="WEP" type="xs:boolean"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11SignalStrength">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="None"/>
-			<xs:enumeration value="Very Bad"/>
-			<xs:enumeration value="Bad"/>
-			<xs:enumeration value="Good"/>
-			<xs:enumeration value="Very Good"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Dot11Status">
-		<xs:sequence>
-			<xs:element name="SSID" type="tt:Dot11SSIDType"/>
-			<xs:element name="BSSID" type="xs:string" minOccurs="0"/>
-			<xs:element name="PairCipher" type="tt:Dot11Cipher" minOccurs="0"/>
-			<xs:element name="GroupCipher" type="tt:Dot11Cipher" minOccurs="0"/>
-			<xs:element name="SignalStrength" type="tt:Dot11SignalStrength" minOccurs="0"/>
-			<xs:element name="ActiveConfigAlias" type="tt:ReferenceToken"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11AuthAndMangementSuite">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="None"/>
-			<xs:enumeration value="Dot1X"/>
-			<xs:enumeration value="PSK"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Dot11AvailableNetworks">
-		<xs:sequence>
-			<xs:element name="SSID" type="tt:Dot11SSIDType"/>
-			<xs:element name="BSSID" type="xs:string" minOccurs="0"/>
-			<xs:element name="AuthAndMangementSuite" type="tt:Dot11AuthAndMangementSuite" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>See IEEE802.11 7.3.2.25.2 for details.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PairCipher" type="tt:Dot11Cipher" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="GroupCipher" type="tt:Dot11Cipher" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="SignalStrength" type="tt:Dot11SignalStrength" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:Dot11AvailableNetworksExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot11AvailableNetworksExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--===============================-->
-	<!--  End, network Related Types   -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   Capabilities Related Types  -->
-	<!--===============================-->
-	<xs:simpleType name="CapabilityCategory">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="All"/>
-			<xs:enumeration value="Analytics"/>
-			<xs:enumeration value="Device"/>
-			<xs:enumeration value="Events"/>
-			<xs:enumeration value="Imaging"/>
-			<xs:enumeration value="Media"/>
-			<xs:enumeration value="PTZ"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Capabilities">
-		<xs:sequence>
-			<xs:element name="Analytics" type="tt:AnalyticsCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Analytics capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Device" type="tt:DeviceCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Device capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Events" type="tt:EventCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Event capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Imaging" type="tt:ImagingCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Imaging capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Media" type="tt:MediaCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Media capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PTZ" type="tt:PTZCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>PTZ capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:CapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="DeviceIO" type="tt:DeviceIOCapabilities" minOccurs="0"/>
-			<xs:element name="Display" type="tt:DisplayCapabilities" minOccurs="0"/>
-			<xs:element name="Recording" type="tt:RecordingCapabilities" minOccurs="0"/>
-			<xs:element name="Search" type="tt:SearchCapabilities" minOccurs="0"/>
-			<xs:element name="Replay" type="tt:ReplayCapabilities" minOccurs="0"/>
-			<xs:element name="Receiver" type="tt:ReceiverCapabilities" minOccurs="0"/>
-			<xs:element name="AnalyticsDevice" type="tt:AnalyticsDeviceCapabilities" minOccurs="0"/>
-			<xs:element name="Extensions" type="tt:CapabilitiesExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CapabilitiesExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Analytics service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RuleSupport" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not rules are supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AnalyticsModuleSupport" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not modules are supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DeviceCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Device service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Network" type="tt:NetworkCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Network capabilities.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="System" type="tt:SystemCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>System capabilities.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IO" type="tt:IOCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>I/O capabilities.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Security" type="tt:SecurityCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Security capabilities.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:DeviceCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DeviceCapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EventCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Event service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WSSubscriptionPolicySupport" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS Subscription policy is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WSPullPointSupport" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS Pull Point is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WSPausableSubscriptionManagerInterfaceSupport" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS Pausable Subscription Manager Interface is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IOCapabilities">
-		<xs:sequence>
-			<xs:element name="InputConnectors" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Number of input connectors.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RelayOutputs" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Number of relay outputs.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:IOCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IOCapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Auxiliary" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="AuxiliaryCommands" type="tt:AuxiliaryData" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:IOCapabilitiesExtension2"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IOCapabilitiesExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MediaCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Media service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StreamingCapabilities" type="tt:RealTimeStreamingCapabilities">
-				<xs:annotation>
-					<xs:documentation>Streaming capabilities.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:MediaCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MediaCapabilitiesExtension">
-		<xs:sequence>
-			<xs:element name="ProfileCapabilities" type="tt:ProfileCapabilities"/>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RealTimeStreamingCapabilities">
-		<xs:sequence>
-			<xs:element name="RTPMulticast" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not RTP multicast is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RTP_TCP" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not RTP over TCP is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RTP_RTSP_TCP" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not RTP/RTSP/TCP is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RealTimeStreamingCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RealTimeStreamingCapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ProfileCapabilities">
-		<xs:sequence>
-			<xs:element name="MaximumNumberOfProfiles" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Maximum number of profiles.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkCapabilities">
-		<xs:sequence>
-			<xs:element name="IPFilter" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IP filtering is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ZeroConfiguration" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not zeroconf is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPVersion6" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IPv6 is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DynDNS" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not  is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NetworkCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkCapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Dot11Configuration" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:NetworkCapabilitiesExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkCapabilitiesExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SecurityCapabilities">
-		<xs:sequence>
-			<xs:element name="TLS1.1" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not TLS 1.1 is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TLS1.2" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not TLS 1.2 is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="OnboardKeyGeneration" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not onboard key generation is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AccessPolicyConfig" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not access policy configuration is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="X.509Token" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS-Security X.509 token is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SAMLToken" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS-Security SAML token is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="KerberosToken" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS-Security Kerberos token is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RELToken" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS-Security REL token is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:SecurityCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SecurityCapabilitiesExtension">
-		<xs:sequence>
-			<xs:element name="TLS1.0" type="xs:boolean"/>
-			<xs:element name="Extension" type="tt:SecurityCapabilitiesExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SecurityCapabilitiesExtension2">
-		<xs:sequence>
-			<xs:element name="Dot1X" type="xs:boolean"/>
-			<xs:element name="SupportedEAPMethod" type="xs:int" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>EAP Methods supported by the device. The int values refer to the <a href="http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml">IANA EAP Registry</a>.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RemoteUserHandling" type="xs:boolean"/>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemCapabilities">
-		<xs:sequence>
-			<xs:element name="DiscoveryResolve" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS Discovery resolve requests are supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DiscoveryBye" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS-Discovery Bye is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RemoteDiscovery" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not remote discovery is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SystemBackup" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not system backup is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SystemLogging" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not system logging is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FirmwareUpgrade" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not firmware upgrade is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedVersions" type="tt:OnvifVersion" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Indicates supported ONVIF version(s).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:SystemCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemCapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="HttpFirmwareUpgrade" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="HttpSystemBackup" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="HttpSystemLogging" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="HttpSupportInformation" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:SystemCapabilitiesExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemCapabilitiesExtension2">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OnvifVersion">
-		<xs:sequence>
-			<xs:element name="Major" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Major version number.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Minor" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>
-						Two digit minor version number.
-						If major version number is less than "16", X.0.1 maps to "01" and X.2.1 maps to "21" where X stands for Major version number.
-						Otherwise, minor number is month of release, such as "06" for June.
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Imaging service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>PTZ service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DeviceIOCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI"/>
-			<xs:element name="VideoSources" type="xs:int"/>
-			<xs:element name="VideoOutputs" type="xs:int"/>
-			<xs:element name="AudioSources" type="xs:int"/>
-			<xs:element name="AudioOutputs" type="xs:int"/>
-			<xs:element name="RelayOutputs" type="xs:int"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DisplayCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI"/>
-			<xs:element name="FixedLayout" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indication that the SetLayout command supports only predefined layouts.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI"/>
-			<xs:element name="ReceiverSource" type="xs:boolean"/>
-			<xs:element name="MediaProfileSource" type="xs:boolean"/>
-			<xs:element name="DynamicRecordings" type="xs:boolean"/>
-			<xs:element name="DynamicTracks" type="xs:boolean"/>
-			<xs:element name="MaxStringLength" type="xs:int"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SearchCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI"/>
-			<xs:element name="MetadataSearch" type="xs:boolean"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ReplayCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>The address of the replay service.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ReceiverCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>The address of the receiver service.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RTP_Multicast" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether the device can receive RTP multicast streams.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RTP_TCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether the device can receive RTP/TCP streams</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RTP_RTSP_TCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether the device can receive RTP/RTSP/TCP streams.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedReceivers" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The maximum number of receivers supported by the device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaximumRTSPURILength" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The maximum allowed length for RTSP URIs.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsDeviceCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI"/>
-			<xs:element name="RuleSupport" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Obsolete property.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:AnalyticsDeviceExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsDeviceExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--===============================-->
-	<!--End, Capabilities Related Types-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--    System Related Types       -->
-	<!--===============================-->
-	<xs:simpleType name="SystemLogType">
-		<xs:annotation>
-			<xs:documentation>Enumeration describing the available system log modes.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="System">
-				<xs:annotation>
-					<xs:documentation>Indicates that a system log is requested.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Access">
-				<xs:annotation>
-					<xs:documentation>Indicates that a access log is requested.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="SystemLog">
-		<xs:sequence>
-			<xs:element name="Binary" type="tt:AttachmentData" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The log information as attachment data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="String" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The log information as character data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SupportInformation">
-		<xs:sequence>
-			<xs:element name="Binary" type="tt:AttachmentData" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The support information as attachment data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="String" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The support information as character data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="BinaryData">
-		<xs:sequence>
-			<xs:element name="Data" type="xs:base64Binary" nillable="false">
-				<xs:annotation>
-					<xs:documentation>base64 encoded binary data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute ref="xmime:contentType" use="optional"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AttachmentData">
-		<xs:sequence>
-			<xs:element ref="xop:Include"/>
-		</xs:sequence>
-		<xs:attribute ref="xmime:contentType" use="optional"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="BackupFile">
-		<xs:sequence>
-			<xs:element name="Name" type="xs:string"/>
-			<xs:element name="Data" type="tt:AttachmentData"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemLogUriList">
-		<xs:sequence>
-			<xs:element name="SystemLog" type="tt:SystemLogUri" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemLogUri">
-		<xs:sequence>
-			<xs:element name="Type" type="tt:SystemLogType"/>
-			<xs:element name="Uri" type="xs:anyURI"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="FactoryDefaultType">
-		<xs:annotation>
-			<xs:documentation>Enumeration describing the available factory default modes.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Hard">
-				<xs:annotation>
-					<xs:documentation>Indicates that a hard factory default is requested.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Soft">
-				<xs:annotation>
-					<xs:documentation>Indicates that a soft factory default is requested.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="SetDateTimeType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Manual">
-				<xs:annotation>
-					<xs:documentation>Indicates that the date and time are set manually.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="NTP">
-				<xs:annotation>
-					<xs:documentation>Indicates that the date and time are set through NTP</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="SystemDateTime">
-		<xs:annotation>
-			<xs:documentation>General date time inforamtion returned by the GetSystemDateTime method.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="DateTimeType" type="tt:SetDateTimeType">
-				<xs:annotation>
-					<xs:documentation>Indicates if the time is set manully or through NTP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DaylightSavings" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Informative indicator whether daylight savings is currently on/off.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TimeZone" type="tt:TimeZone" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Timezone information in Posix format.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="UTCDateTime" type="tt:DateTime" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Current system date and time in UTC format. This field is mandatory since version 2.0.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="LocalDateTime" type="tt:DateTime" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Date and time in local format.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:SystemDateTimeExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemDateTimeExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DateTime">
-		<xs:sequence>
-			<xs:element name="Time" type="tt:Time"/>
-			<xs:element name="Date" type="tt:Date"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Date">
-		<xs:sequence>
-			<xs:element name="Year" type="xs:int"/>
-			<xs:element name="Month" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Range is 1 to 12.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Day" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Range is 1 to 31.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Time">
-		<xs:sequence>
-			<xs:element name="Hour" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Range is 0 to 23.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Minute" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Range is 0 to 59.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Second" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Range is 0 to 61 (typically 59).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="TimeZone">
-		<xs:annotation>
-			<xs:documentation>
-				The TZ format is specified by POSIX, please refer to POSIX 1003.1 section 8.3<br/>
-				Example: Europe, Paris TZ=CET-1CEST,M3.5.0/2,M10.5.0/3<br/>
-				CET = designation for standard time when daylight saving is not in force<br/>
-				-1 = offset in hours = negative so 1 hour east of Greenwich meridian<br/>
-				CEST = designation when daylight saving is in force ("Central European Summer Time")<br/>
-				, = no offset number between code and comma, so default to one hour ahead for daylight saving<br/>
-				M3.5.0 = when daylight saving starts = the last Sunday in March (the "5th" week means the last in the month)<br/>
-				/2, = the local time when the switch occurs = 2 a.m. in this case<br/>
-				M10.5.0 = when daylight saving ends = the last Sunday in October.<br/>
-				/3, = the local time when the switch occurs = 3 a.m. in this case<br/>
-			</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="TZ" type="xs:token">
-				<xs:annotation>
-					<xs:documentation>Posix timezone string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="GeoLocation">
-		<xs:sequence>
-			<xs:any maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="lon" type="xs:double">
-			<xs:annotation>
-				<xs:documentation>East west location as angle.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="lat" type="xs:double">
-			<xs:annotation>
-				<xs:documentation>North south location as angle.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="elevation" type="xs:float">
-			<xs:annotation>
-				<xs:documentation>Hight in meters above sea level.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="GeoOrientation">
-		<xs:sequence>
-			<xs:any maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="roll" type="xs:float">
-			<xs:annotation>
-				<xs:documentation>Rotation around the x axis.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="pitch" type="xs:float">
-			<xs:annotation>
-				<xs:documentation>Rotation around the y axis.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="yaw" type="xs:float">
-			<xs:annotation>
-				<xs:documentation>Rotation around the z axis.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="LocalLocation">
-		<xs:sequence>
-			<xs:any maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="x" type="xs:float">
-			<xs:annotation>
-				<xs:documentation>East west location as angle.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="y" type="xs:float">
-			<xs:annotation>
-				<xs:documentation>North south location as angle.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="z" type="xs:float">
-			<xs:annotation>
-				<xs:documentation>Offset in meters from the sea level.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="LocalOrientation">
-		<xs:sequence>
-			<xs:any maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="pan" type="xs:float">
-			<xs:annotation>
-				<xs:documentation>Rotation around the y axis.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="tilt" type="xs:float">
-			<xs:annotation>
-				<xs:documentation>Rotation around the z axis.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="roll" type="xs:float">
-			<xs:annotation>
-				<xs:documentation>Rotation around the x axis.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Entity">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Device"/>
-			<xs:enumeration value="VideoSource"/>
-			<xs:enumeration value="AudioSource"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="LocationEntity">
-		<xs:sequence>
-			<xs:element name="GeoLocation" type="tt:GeoLocation" minOccurs="0">
-				<xs:annotation><xs:documentation>Location on earth.</xs:documentation></xs:annotation>
-			</xs:element>
-			<xs:element name="GeoOrientation" type="tt:GeoOrientation" minOccurs="0">
-				<xs:annotation><xs:documentation>Orientation relative to earth.</xs:documentation></xs:annotation>
-			</xs:element>
-			<xs:element name="LocalLocation" type="tt:LocalLocation" minOccurs="0">
-				<xs:annotation><xs:documentation>Indoor location offset.</xs:documentation></xs:annotation>
-			</xs:element>
-			<xs:element name="LocalOrientation" type="tt:LocalOrientation" minOccurs="0">
-				<xs:annotation><xs:documentation>Indoor orientation offset.</xs:documentation></xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="Entity" type="xs:string">
-			<xs:annotation><xs:documentation>Entity type the entry refers to as defined in tds:Entity.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="Token" type="tt:ReferenceToken">
-			<xs:annotation><xs:documentation>Optional entity token.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="Fixed" type="xs:boolean">
-			<xs:annotation><xs:documentation>If this value is true the entity cannot be deleted.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="GeoSource" type="xs:anyURI">
-			<xs:annotation><xs:documentation>Optional reference to the XAddr of another devices DeviceManagement service.</xs:documentation></xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="AutoGeo" type="xs:boolean">
-			<xs:annotation><xs:documentation>If set the geo location is obtained internally.</xs:documentation></xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   End, System Related Types   -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   RemoteUser Handling Types    -->
-	<!--===============================-->
-	<xs:complexType name="RemoteUser">
-		<xs:sequence>
-			<xs:element name="Username" type="xs:string"/>
-			<xs:element name="Password" type="xs:string" minOccurs="0"/>
-			<xs:element name="UseDerivedPassword" type="xs:boolean"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   End, RemoteUser Handling Types    -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   UserToken Handling Types    -->
-	<!--===============================-->
-	<xs:simpleType name="UserLevel">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Administrator"/>
-			<xs:enumeration value="Operator"/>
-			<xs:enumeration value="User"/>
-			<xs:enumeration value="Anonymous"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="User">
-		<xs:sequence>
-			<xs:element name="Username" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Username string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Password" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Password string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="UserLevel" type="tt:UserLevel">
-				<xs:annotation>
-					<xs:documentation>User level string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:UserExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="UserExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!-- End, UserToken Handling Types -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   Security Management Types   -->
-	<!--===============================-->
-	<xs:complexType name="CertificateGenerationParameters">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token" minOccurs="0"/>
-			<xs:element name="Subject" type="xs:string" minOccurs="0"/>
-			<xs:element name="ValidNotBefore" type="xs:token" minOccurs="0"/>
-			<xs:element name="ValidNotAfter" type="xs:token" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:CertificateGenerationParametersExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateGenerationParametersExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Certificate">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token">
-				<xs:annotation>
-					<xs:documentation>Certificate id.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Certificate" type="tt:BinaryData">
-				<xs:annotation>
-					<xs:documentation>base64 encoded DER representation of certificate.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateStatus">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token">
-				<xs:annotation>
-					<xs:documentation>Certificate id.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Status" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not a certificate is used in a HTTPS configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateWithPrivateKey">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token" minOccurs="0"/>
-			<xs:element name="Certificate" type="tt:BinaryData"/>
-			<xs:element name="PrivateKey" type="tt:BinaryData"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateInformation">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token"/>
-			<xs:element name="IssuerDN" type="xs:string" minOccurs="0"/>
-			<xs:element name="SubjectDN" type="xs:string" minOccurs="0"/>
-			<xs:element name="KeyUsage" type="tt:CertificateUsage" minOccurs="0"/>
-			<xs:element name="ExtendedKeyUsage" type="tt:CertificateUsage" minOccurs="0"/>
-			<xs:element name="KeyLength" type="xs:int" minOccurs="0"/>
-			<xs:element name="Version" type="xs:string" minOccurs="0"/>
-			<xs:element name="SerialNum" type="xs:string" minOccurs="0"/>
-			<xs:element name="SignatureAlgorithm" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Validity Range is from "NotBefore" to "NotAfter"; the corresponding DateTimeRange is from "From" to "Until"</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Validity" type="tt:DateTimeRange" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:CertificateInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateUsage">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="Critical" type="xs:boolean" use="required"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--End, Security management Types -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   Start Dot1X related Types   -->
-	<!--===============================-->
-	<xs:complexType name="Dot1XConfiguration">
-		<xs:sequence>
-			<xs:element name="Dot1XConfigurationToken" type="tt:ReferenceToken"/>
-			<xs:element name="Identity" type="xs:string"/>
-			<xs:element name="AnonymousID" type="xs:string" minOccurs="0"/>
-			<xs:element name="EAPMethod" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>
-				EAP Method type as defined in <a href="http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml">IANA EAP Registry</a>.
-			</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CACertificateID" type="xs:token" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="EAPMethodConfiguration" type="tt:EAPMethodConfiguration" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:Dot1XConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot1XConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EAPMethodConfiguration">
-		<xs:sequence>
-			<xs:element name="TLSConfiguration" type="tt:TLSConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Confgiuration information for TLS Method.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Password" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Password for those EAP Methods that require a password. The password shall never be returned on a get method.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:EapMethodExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EapMethodExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="TLSConfiguration">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="GenericEapPwdConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--End, Dot1X related Types -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   Start IO management Types   -->
-	<!--===============================-->
-	<xs:simpleType name="RelayLogicalState">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="active"/>
-			<xs:enumeration value="inactive"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="RelayIdleState">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="closed"/>
-			<xs:enumeration value="open"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RelayOutputSettings">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:RelayMode">
-				<xs:annotation>
-					<xs:documentation>
-					'Bistable' or 'Monostable'
-					<ul>
-							<li>Bistable – After setting the state, the relay remains in this state.</li>
-							<li>Monostable – After setting the state, the relay returns to its idle state after the specified time.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DelayTime" type="xs:duration">
-				<xs:annotation>
-					<xs:documentation>Time after which the relay returns to its idle state if it is in monostable mode. If the Mode field is set to bistable mode the value of the parameter can be ignored.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IdleState" type="tt:RelayIdleState">
-				<xs:annotation>
-					<xs:documentation>
-			'open' or 'closed'
-			<ul>
-							<li>'open' means that the relay is open when the relay state is set to 'inactive' through the trigger command and closed when the state is set to 'active' through the same command.</li>
-							<li>'closed' means that the relay is closed when the relay state is set to 'inactive' through the trigger command and open when the state is set to 'active' through the same command.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="RelayMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Monostable"/>
-			<xs:enumeration value="Bistable"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RelayOutput">
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Properties" type="tt:RelayOutputSettings"/>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="DigitalIdleState">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="closed"/>
-			<xs:enumeration value="open"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="DigitalInput">
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first ONVIF then Vendor -->
-				</xs:sequence>
-				<xs:attribute name="IdleState" type="tt:DigitalIdleState">
-					<xs:annotation>
-						<xs:documentation>
-							Indicate the Digital IdleState status.
-						</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   End, IO management Types    -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--    Start PTZ Related Types    -->
-	<!--===============================-->
-	<xs:complexType name="PTZNode">
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Name" type="tt:Name" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                A unique identifier that is used to reference PTZ Nodes.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SupportedPTZSpaces" type="tt:PTZSpaces">
-						<xs:annotation>
-							<xs:documentation>
-                A list of Coordinate Systems available for the PTZ Node. For each Coordinate System, the PTZ Node MUST specify its allowed range.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="MaximumNumberOfPresets" type="xs:int">
-						<xs:annotation>
-							<xs:documentation>
-                All preset operations MUST be available for this PTZ Node if one preset is supported.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="HomeSupported" type="xs:boolean">
-						<xs:annotation>
-							<xs:documentation>
-                A boolean operator specifying the availability of a home position. If set to true, the Home Position Operations MUST be available for this PTZ Node.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AuxiliaryCommands" type="tt:AuxiliaryData" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>
-                A list of supported Auxiliary commands. If the list is not empty, the Auxiliary Operations MUST be available for this PTZ Node.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:PTZNodeExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:attribute name="FixedHomePosition" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>
-      				Indication whether the HomePosition of a Node is fixed or it can be changed via the SetHomePosition command.
-      			</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZNodeExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="SupportedPresetTour" type="tt:PTZPresetTourSupported" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            Detail of supported Preset Tour feature.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZNodeExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZNodeExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourSupported">
-		<xs:sequence>
-			<xs:element name="MaximumNumberOfPresetTours" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Indicates number of preset tours that can be created. Required preset tour operations shall be available for this PTZ Node if one or more preset tour is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PTZPresetTourOperation" type="tt:PTZPresetTourOperation" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Indicates which preset tour operations are available for this PTZ Node.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourSupportedExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourSupportedExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="NodeToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>
-                A mandatory reference to the PTZ Node that the PTZ Configuration belongs to.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultAbsolutePantTiltPositionSpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports absolute Pan/Tilt movements, it shall specify one Absolute Pan/Tilt Position Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultAbsoluteZoomPositionSpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports absolute zoom movements, it shall specify one Absolute Zoom Position Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultRelativePanTiltTranslationSpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports relative Pan/Tilt movements, it shall specify one RelativePan/Tilt Translation Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultRelativeZoomTranslationSpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports relative zoom movements, it shall specify one Relative Zoom Translation Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultContinuousPanTiltVelocitySpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports continuous Pan/Tilt movements, it shall specify one Continuous Pan/Tilt Velocity Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultContinuousZoomVelocitySpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports continuous zoom movements, it shall specify one Continuous Zoom Velocity Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultPTZSpeed" type="tt:PTZSpeed" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports absolute or relative PTZ movements, it shall specify corresponding default Pan/Tilt and Zoom speeds.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultPTZTimeout" type="xs:duration" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports continuous movements, it shall specify a default timeout, after which the movement stops.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="PanTiltLimits" type="tt:PanTiltLimits" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                The Pan/Tilt limits element should be present for a PTZ Node that supports an absolute Pan/Tilt. If the element is present it signals the support for configurable Pan/Tilt limits. If limits are enabled, the Pan/Tilt movements shall always stay within the specified range. The Pan/Tilt limits are disabled by setting the limits to –INF or +INF.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="ZoomLimits" type="tt:ZoomLimits" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                The Zoom limits element should be present for a PTZ Node that supports absolute zoom. If the element is present it signals the supports for configurable Zoom limits. If limits are enabled the zoom movements shall always stay within the specified range. The Zoom limits are disabled by settings the limits to -INF and +INF.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:PTZConfigurationExtension" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-				</xs:sequence>
-				<xs:attribute name="MoveRamp" type="xs:int">
-					<xs:annotation>
-						<xs:documentation>The optional acceleration ramp used by the device when moving.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="PresetRamp" type="xs:int">
-					<xs:annotation>
-						<xs:documentation>The optional acceleration ramp used by the device when recalling presets.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="PresetTourRamp" type="xs:int">
-					<xs:annotation>
-						<xs:documentation>The optional acceleration ramp used by the device when executing PresetTours.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="PTControlDirection" type="tt:PTControlDirection" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure PT Control Direction related features.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZConfigurationExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZConfigurationExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTControlDirection">
-		<xs:sequence>
-			<xs:element name="EFlip" type="tt:EFlip" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure related parameters for E-Flip.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Reverse" type="tt:Reverse" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure related parameters for reversing of PT Control Direction.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTControlDirectionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTControlDirectionExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EFlip">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:EFlipMode">
-				<xs:annotation>
-					<xs:documentation>Parameter to enable/disable E-Flip feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Reverse">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ReverseMode">
-				<xs:annotation>
-					<xs:documentation>Parameter to enable/disable Reverse feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="EFlipMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="ON"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="ReverseMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="ON"/>
-			<xs:enumeration value="AUTO"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="PTZConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="Spaces" type="tt:PTZSpaces">
-				<xs:annotation>
-					<xs:documentation>
-            A list of supported coordinate systems including their range limitations.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PTZTimeout" type="tt:DurationRange">
-				<xs:annotation>
-					<xs:documentation>
-            A timeout Range within which Timeouts are accepted by the PTZ Node.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="PTControlDirection" type="tt:PTControlDirectionOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported options for PT Direction Control.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZConfigurationOptions2" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="PTZRamps" type="tt:IntAttrList">
-			<xs:annotation>
-				<xs:documentation>
-					The list of acceleration ramps supported by the device. The
-					smallest acceleration value corresponds to the minimal index, the
-					highest acceleration corresponds to the maximum index.					
-				</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZConfigurationOptions2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTControlDirectionOptions">
-		<xs:sequence>
-			<xs:element name="EFlip" type="tt:EFlipOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported options for EFlip feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Reverse" type="tt:ReverseOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported options for Reverse feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTControlDirectionOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTControlDirectionOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EFlipOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:EFlipMode" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Options of EFlip mode parameter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:EFlipOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EFlipOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ReverseOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ReverseMode" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Options of Reverse mode parameter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ReverseOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ReverseOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PanTiltLimits">
-		<xs:sequence>
-			<xs:element name="Range" type="tt:Space2DDescription">
-				<xs:annotation>
-					<xs:documentation>
-            A range of pan tilt limits.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ZoomLimits">
-		<xs:sequence>
-			<xs:element name="Range" type="tt:Space1DDescription">
-				<xs:annotation>
-					<xs:documentation>
-            A range of zoom limit
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZSpaces">
-		<xs:sequence>
-			<xs:element name="AbsolutePanTiltPositionSpace" type="tt:Space2DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The Generic Pan/Tilt Position space is provided by every PTZ node that supports absolute Pan/Tilt, since it does not relate to a specific physical range. 
-			Instead, the range should be defined as the full range of the PTZ unit normalized to the range -1 to 1 resulting in the following space description.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AbsoluteZoomPositionSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The Generic Zoom Position Space is provided by every PTZ node that supports absolute Zoom, since it does not relate to a specific physical range. 
-			Instead, the range should be defined as the full range of the Zoom normalized to the range 0 (wide) to 1 (tele). 
-			There is no assumption about how the generic zoom range is mapped to magnification, FOV or other physical zoom dimension.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RelativePanTiltTranslationSpace" type="tt:Space2DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The Generic Pan/Tilt translation space is provided by every PTZ node that supports relative Pan/Tilt, since it does not relate to a specific physical range. 
-			Instead, the range should be defined as the full positive and negative translation range of the PTZ unit normalized to the range -1 to 1, 
-			where positive translation would mean clockwise rotation or movement in right/up direction resulting in the following space description.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RelativeZoomTranslationSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The Generic Zoom Translation Space is provided by every PTZ node that supports relative Zoom, since it does not relate to a specific physical range. 
-			Instead, the corresponding absolute range should be defined as the full positive and negative translation range of the Zoom normalized to the range -1 to1, 
-			where a positive translation maps to a movement in TELE direction. The translation is signed to indicate direction (negative is to wide, positive is to tele). 
-			There is no assumption about how the generic zoom range is mapped to magnification, FOV or other physical zoom dimension. This results in the following space description.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ContinuousPanTiltVelocitySpace" type="tt:Space2DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The generic Pan/Tilt velocity space shall be provided by every PTZ node, since it does not relate to a specific physical range. 
-			Instead, the range should be defined as a range of the PTZ unit’s speed normalized to the range -1 to 1, where a positive velocity would map to clockwise 
-			rotation or movement in the right/up direction. A signed speed can be independently specified for the pan and tilt component resulting in the following space description.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ContinuousZoomVelocitySpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The generic zoom velocity space specifies a zoom factor velocity without knowing the underlying physical model. The range should be normalized from -1 to 1, 
-			where a positive velocity would map to TELE direction. A generic zoom velocity space description resembles the following.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PanTiltSpeedSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The speed space specifies the speed for a Pan/Tilt movement when moving to an absolute position or to a relative translation. 
-			In contrast to the velocity spaces, speed spaces do not contain any directional information. The speed of a combined Pan/Tilt 
-			movement is represented by a single non-negative scalar value.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ZoomSpeedSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The speed space specifies the speed for a Zoom movement when moving to an absolute position or to a relative translation. 
-			In contrast to the velocity spaces, speed spaces do not contain any directional information. 
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZSpacesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZSpacesExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Space2DDescription">
-		<xs:sequence>
-			<xs:element name="URI" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>
-            A URI of coordinate systems.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="XRange" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-            A range of x-axis.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="YRange" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-            A range of y-axis.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Space1DDescription">
-		<xs:sequence>
-			<xs:element name="URI" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>
-            A URI of coordinate systems.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="XRange" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-            A range of x-axis.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZSpeed">
-		<xs:sequence>
-			<xs:element name="PanTilt" type="tt:Vector2D" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Pan and tilt speed. The x component corresponds to pan and the y component to tilt. If omitted in a request, the current (if any) PanTilt movement should not be affected. </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Zoom" type="tt:Vector1D" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            A zoom speed. If omitted in a request, the current (if any) Zoom movement should not be affected.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPreset">
-		<xs:sequence>
-			<xs:element name="Name" type="tt:Name" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            A list of preset position name.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PTZPosition" type="tt:PTZVector" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            A list of preset position.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="token" type="tt:ReferenceToken">
-			<xs:annotation>
-				<xs:documentation>
-        </xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="AuxiliaryData">
-		<xs:restriction base="xs:string">
-			<xs:maxLength value="128"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="PTZPresetTourState">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Idle"/>
-			<xs:enumeration value="Touring"/>
-			<xs:enumeration value="Paused"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="PTZPresetTourDirection">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Forward"/>
-			<xs:enumeration value="Backward"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="PTZPresetTourOperation">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Start"/>
-			<xs:enumeration value="Stop"/>
-			<xs:enumeration value="Pause"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="PresetTour">
-		<xs:sequence>
-			<xs:element name="Name" type="tt:Name" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Readable name of the preset tour.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Status" type="tt:PTZPresetTourStatus">
-				<xs:annotation>
-					<xs:documentation>Read only parameters to indicate the status of the preset tour.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AutoStart" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Auto Start flag of the preset tour. True allows the preset tour to be activated always.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StartingCondition" type="tt:PTZPresetTourStartingCondition">
-				<xs:annotation>
-					<xs:documentation>Parameters to specify the detail behavior of the preset tour.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TourSpot" type="tt:PTZPresetTourSpot" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A list of detail of touring spots including preset positions.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="token" type="tt:ReferenceToken">
-			<xs:annotation>
-				<xs:documentation>Unique identifier of this preset tour.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourSpot">
-		<xs:sequence>
-			<xs:element name="PresetDetail" type="tt:PTZPresetTourPresetDetail">
-				<xs:annotation>
-					<xs:documentation>Detail definition of preset position of the tour spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="tt:PTZSpeed" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to specify Pan/Tilt and Zoom speed on moving toward this tour spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StayTime" type="xs:duration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to specify time duration of staying on this tour sport.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourSpotExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourSpotExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourPresetDetail">
-		<xs:sequence>
-			<xs:choice>
-				<xs:element name="PresetToken" type="tt:ReferenceToken">
-					<xs:annotation>
-						<xs:documentation>Option to specify the preset position with Preset Token defined in advance.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="Home" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Option to specify the preset position with the home position of this PTZ Node. "False" to this parameter shall be treated as an invalid argument.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="PTZPosition" type="tt:PTZVector">
-					<xs:annotation>
-						<xs:documentation>Option to specify the preset position with vector of PTZ node directly.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="TypeExtension" type="tt:PTZPresetTourTypeExtension"/>
-			</xs:choice>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourTypeExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStatus">
-		<xs:sequence>
-			<xs:element name="State" type="tt:PTZPresetTourState">
-				<xs:annotation>
-					<xs:documentation>Indicates state of this preset tour by Idle/Touring/Paused.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CurrentTourSpot" type="tt:PTZPresetTourSpot" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates a tour spot currently staying.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourStatusExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStatusExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStartingCondition">
-		<xs:sequence>
-			<xs:element name="RecurringTime" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to specify how many times the preset tour is recurred.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RecurringDuration" type="xs:duration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to specify how long time duration the preset tour is recurred.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Direction" type="tt:PTZPresetTourDirection" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to choose which direction the preset tour goes. Forward shall be chosen in case it is omitted.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourStartingConditionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="RandomPresetOrder" type="xs:boolean">
-			<xs:annotation>
-				<xs:documentation>Execute presets in random order. If set to true and Direction is also present, Direction will be ignored and presets of the Tour will be recalled randomly.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStartingConditionExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourOptions">
-		<xs:sequence>
-			<xs:element name="AutoStart" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not the AutoStart is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StartingCondition" type="tt:PTZPresetTourStartingConditionOptions">
-				<xs:annotation>
-					<xs:documentation>Supported options for Preset Tour Starting Condition.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TourSpot" type="tt:PTZPresetTourSpotOptions">
-				<xs:annotation>
-					<xs:documentation>Supported options for Preset Tour Spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourSpotOptions">
-		<xs:sequence>
-			<xs:element name="PresetDetail" type="tt:PTZPresetTourPresetDetailOptions">
-				<xs:annotation>
-					<xs:documentation>Supported options for detail definition of preset position of the tour spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StayTime" type="tt:DurationRange">
-				<xs:annotation>
-					<xs:documentation>Supported range of stay time for a tour spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourPresetDetailOptions">
-		<xs:sequence>
-			<xs:element name="PresetToken" type="tt:ReferenceToken" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A list of available Preset Tokens for tour spots.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Home" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>An option to indicate Home postion for tour spots.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PanTiltPositionSpace" type="tt:Space2DDescription" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported range of Pan and Tilt for tour spots.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ZoomPositionSpace" type="tt:Space1DDescription" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported range of Zoom for a tour spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourPresetDetailOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourPresetDetailOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStartingConditionOptions">
-		<xs:sequence>
-			<xs:element name="RecurringTime" type="tt:IntRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported range of Recurring Time.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RecurringDuration" type="tt:DurationRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported range of Recurring Duration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Direction" type="tt:PTZPresetTourDirection" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Supported options for Direction of Preset Tour.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourStartingConditionOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStartingConditionOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--     End, PTZ Related Types    -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--      Imaging Related Types    -->
-	<!--===============================-->
-	<xs:complexType name="ImagingStatus">
-		<xs:sequence>
-			<xs:element name="FocusStatus" type="tt:FocusStatus"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusStatus">
-		<xs:sequence>
-			<xs:element name="Position" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Status of focus position.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MoveStatus" type="tt:MoveStatus">
-				<xs:annotation>
-					<xs:documentation>
-				Status of focus MoveStatus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Error" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>
-				Error status of focus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusConfiguration">
-		<xs:sequence>
-			<xs:element name="AutoFocusMode" type="tt:AutoFocusMode"/>
-			<xs:element name="DefaultSpeed" type="xs:float"/>
-			<xs:element name="NearLimit" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Parameter to set autofocus near limit (unit: meter).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FarLimit" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Parameter to set autofocus far limit (unit: meter).
-If set to 0.0, infinity will be used.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="AutoFocusMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="AUTO"/>
-			<xs:enumeration value="MANUAL"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettings">
-		<xs:sequence>
-			<xs:element name="BacklightCompensation" type="tt:BacklightCompensation" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Enabled/disabled BLC mode (on/off).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Brightness" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Image brightness (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ColorSaturation" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Color saturation of the image (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Contrast" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Contrast of the image (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Exposure" type="tt:Exposure" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Exposure mode of the device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Focus" type="tt:FocusConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Focus configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IrCutFilter" type="tt:IrCutFilterMode" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Infrared Cutoff Filter settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Sharpness" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Sharpness of the Video image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WideDynamicRange" type="tt:WideDynamicRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>WDR settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WhiteBalance" type="tt:WhiteBalance" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>White balance settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingSettingsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettingsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Exposure">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ExposureMode">
-				<xs:annotation>
-					<xs:documentation>
-					Exposure Mode
-					<ul>
-							<li>Auto – Enabled the exposure algorithm on the NVT.</li>
-							<li>Manual – Disabled exposure algorithm on the NVT.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Priority" type="tt:ExposurePriority">
-				<xs:annotation>
-					<xs:documentation>
-				The exposure priority mode (low noise/framerate).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Window" type="tt:Rectangle">
-				<xs:annotation>
-					<xs:documentation>
-				Rectangular exposure mask.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinExposureTime" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of exposure time range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxExposureTime" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of exposure time range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinGain" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of the sensor gain range that is allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxGain" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of the sensor gain range that is allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinIris" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of the iris range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxIris" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of the iris range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ExposureTime" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed exposure time used by the image sensor (&#956;s).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Gain" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed gain used by the image sensor (dB).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Iris" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed attenuation of input light affected by the iris (dB). 0dB maps to a fully opened iris.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="WideDynamicMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="ON"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="WideDynamicRange">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WideDynamicMode">
-				<xs:annotation>
-					<xs:documentation>
-				White dynamic range (on/off)
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Optional level parameter (unitless)
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="BacklightCompensationMode">
-		<xs:annotation>
-			<xs:documentation>Enumeration describing the available backlight compenstation modes.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF">
-				<xs:annotation>
-					<xs:documentation>Backlight compensation is disabled.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="ON">
-				<xs:annotation>
-					<xs:documentation>Backlight compensation is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="BacklightCompensation">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:BacklightCompensationMode">
-				<xs:annotation>
-					<xs:documentation>Backlight compensation mode (on/off).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Optional level parameter (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ExposurePriority">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="LowNoise"/>
-			<xs:enumeration value="FrameRate"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="ImagingOptions">
-		<xs:sequence>
-			<xs:element name="BacklightCompensation" type="tt:BacklightCompensationOptions"/>
-			<xs:element name="Brightness" type="tt:FloatRange"/>
-			<xs:element name="ColorSaturation" type="tt:FloatRange"/>
-			<xs:element name="Contrast" type="tt:FloatRange"/>
-			<xs:element name="Exposure" type="tt:ExposureOptions"/>
-			<xs:element name="Focus" type="tt:FocusOptions"/>
-			<xs:element name="IrCutFilterModes" type="tt:IrCutFilterMode" maxOccurs="unbounded"/>
-			<xs:element name="Sharpness" type="tt:FloatRange"/>
-			<xs:element name="WideDynamicRange" type="tt:WideDynamicRangeOptions"/>
-			<xs:element name="WhiteBalance" type="tt:WhiteBalanceOptions"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WideDynamicRangeOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WideDynamicMode" maxOccurs="unbounded"/>
-			<xs:element name="Level" type="tt:FloatRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="BacklightCompensationOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WideDynamicMode" maxOccurs="unbounded"/>
-			<xs:element name="Level" type="tt:FloatRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusOptions">
-		<xs:sequence>
-			<xs:element name="AutoFocusModes" type="tt:AutoFocusMode" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="DefaultSpeed" type="tt:FloatRange"/>
-			<xs:element name="NearLimit" type="tt:FloatRange"/>
-			<xs:element name="FarLimit" type="tt:FloatRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ExposureOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ExposureMode" maxOccurs="unbounded"/>
-			<xs:element name="Priority" type="tt:ExposurePriority" maxOccurs="unbounded"/>
-			<xs:element name="MinExposureTime" type="tt:FloatRange"/>
-			<xs:element name="MaxExposureTime" type="tt:FloatRange"/>
-			<xs:element name="MinGain" type="tt:FloatRange"/>
-			<xs:element name="MaxGain" type="tt:FloatRange"/>
-			<xs:element name="MinIris" type="tt:FloatRange"/>
-			<xs:element name="MaxIris" type="tt:FloatRange"/>
-			<xs:element name="ExposureTime" type="tt:FloatRange"/>
-			<xs:element name="Gain" type="tt:FloatRange"/>
-			<xs:element name="Iris" type="tt:FloatRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalanceOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WhiteBalanceMode" maxOccurs="unbounded"/>
-			<xs:element name="YrGain" type="tt:FloatRange"/>
-			<xs:element name="YbGain" type="tt:FloatRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusMove">
-		<xs:sequence>
-			<xs:element name="Absolute" type="tt:AbsoluteFocus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Parameters for the absolute focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Relative" type="tt:RelativeFocus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Parameters for the relative focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Continuous" type="tt:ContinuousFocus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Parameter for the continuous focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AbsoluteFocus">
-		<xs:sequence>
-			<xs:element name="Position" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Position parameter for the absolute focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Speed parameter for the absolute focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RelativeFocus">
-		<xs:sequence>
-			<xs:element name="Distance" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Distance parameter for the relative focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Speed parameter for the relative focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ContinuousFocus">
-		<xs:sequence>
-			<xs:element name="Speed" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Speed parameter for the Continuous focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MoveOptions">
-		<xs:sequence>
-			<xs:element name="Absolute" type="tt:AbsoluteFocusOptions" minOccurs="0"/>
-			<xs:element name="Relative" type="tt:RelativeFocusOptions" minOccurs="0"/>
-			<xs:element name="Continuous" type="tt:ContinuousFocusOptions" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AbsoluteFocusOptions">
-		<xs:sequence>
-			<xs:element name="Position" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the position.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the speed.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RelativeFocusOptions">
-		<xs:sequence>
-			<xs:element name="Distance" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the distance.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the speed.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ContinuousFocusOptions">
-		<xs:sequence>
-			<xs:element name="Speed" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the speed.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ExposureMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="AUTO"/>
-			<xs:enumeration value="MANUAL"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Enabled">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="ENABLED"/>
-			<xs:enumeration value="DISABLED"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="WhiteBalanceMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="AUTO"/>
-			<xs:enumeration value="MANUAL"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="IrCutFilterMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="ON"/>
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="AUTO"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalance">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WhiteBalanceMode">
-				<xs:annotation>
-					<xs:documentation>Auto whitebalancing mode (auto/manual).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CrGain" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Rgain (unitless).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CbGain" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Bgain (unitless).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--  End, Imaging Related Types   -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--      Imaging Version 2.0 Related Types    -->
-	<!--===============================-->
-	<xs:complexType name="ImagingStatus20">
-		<xs:sequence>
-			<xs:element name="FocusStatus20" type="tt:FocusStatus20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Status of focus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingStatus20Extension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingStatus20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusStatus20">
-		<xs:sequence>
-			<xs:element name="Position" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Status of focus position.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MoveStatus" type="tt:MoveStatus">
-				<xs:annotation>
-					<xs:documentation>
-				Status of focus MoveStatus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Error" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Error status of focus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:FocusStatus20Extension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusStatus20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettings20">
-		<xs:annotation>
-			<xs:documentation>Type describing the ImagingSettings of a VideoSource. The supported options and ranges can be obtained via the GetOptions command.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="BacklightCompensation" type="tt:BacklightCompensation20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Enabled/disabled BLC mode (on/off).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Brightness" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Image brightness (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ColorSaturation" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Color saturation of the image (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Contrast" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Contrast of the image (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Exposure" type="tt:Exposure20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Exposure mode of the device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Focus" type="tt:FocusConfiguration20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Focus configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IrCutFilter" type="tt:IrCutFilterMode" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Infrared Cutoff Filter settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Sharpness" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Sharpness of the Video image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WideDynamicRange" type="tt:WideDynamicRange20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>WDR settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WhiteBalance" type="tt:WhiteBalance20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>White balance settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingSettingsExtension20" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettingsExtension20">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="ImageStabilization" type="tt:ImageStabilization" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure Image Stabilization feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingSettingsExtension202" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettingsExtension202">
-		<xs:sequence>
-			<xs:element name="IrCutFilterAutoAdjustment" type="tt:IrCutFilterAutoAdjustment" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>An optional parameter applied to only auto mode to adjust timing of toggling Ir cut filter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingSettingsExtension203" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettingsExtension203">
-		<xs:sequence>
-			<xs:element name="ToneCompensation" type="tt:ToneCompensation" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure Image Contrast Compensation.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Defogging" type="tt:Defogging" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure Image Defogging.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="NoiseReduction" type="tt:NoiseReduction" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure Image Noise Reduction.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingSettingsExtension204" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettingsExtension204">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImageStabilization">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ImageStabilizationMode">
-				<xs:annotation>
-					<xs:documentation>Parameter to enable/disable Image Stabilization feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional level parameter (unit unspecified)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImageStabilizationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImageStabilizationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ImageStabilizationMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="ON"/>
-			<xs:enumeration value="AUTO"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="IrCutFilterAutoAdjustment">
-		<xs:sequence>
-			<xs:element name="BoundaryType" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Specifies which boundaries to automatically toggle Ir cut filter following parameters are applied to. Its options shall be chosen from tt:IrCutFilterAutoBoundaryType.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BoundaryOffset" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Adjusts boundary exposure level for toggling Ir cut filter to on/off specified with unitless normalized value from +1.0 to -1.0. Zero is default and -1.0 is the darkest adjustment (Unitless).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ResponseTime" type="xs:duration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Delay time of toggling Ir cut filter to on/off after crossing of the boundary exposure levels.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:IrCutFilterAutoAdjustmentExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax" />
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IrCutFilterAutoAdjustmentExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="IrCutFilterAutoBoundaryType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Common" />
-			<xs:enumeration value="ToOn" />
-			<xs:enumeration value="ToOff" />
-			<xs:enumeration value="Extended" />
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="WideDynamicRange20">
-		<xs:annotation>
-			<xs:documentation>Type describing whether WDR mode is enabled or disabled (on/off).</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WideDynamicMode">
-				<xs:annotation>
-					<xs:documentation>Wide dynamic range mode (on/off).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional level parameter (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="BacklightCompensation20">
-		<xs:annotation>
-			<xs:documentation>Type describing whether BLC mode is enabled or disabled (on/off).</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:BacklightCompensationMode">
-				<xs:annotation>
-					<xs:documentation>Backlight compensation mode (on/off).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional level parameter (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Exposure20">
-		<xs:annotation>
-			<xs:documentation>Type describing the exposure settings.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ExposureMode">
-				<xs:annotation>
-					<xs:documentation>
-				Exposure Mode
-				<ul>
-							<li>Auto – Enabled the exposure algorithm on the device.</li>
-							<li>Manual – Disabled exposure algorithm on the device.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Priority" type="tt:ExposurePriority" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				The exposure priority mode (low noise/framerate).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Window" type="tt:Rectangle" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Rectangular exposure mask.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinExposureTime" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of exposure time range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxExposureTime" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of exposure time range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinGain" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of the sensor gain range that is allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxGain" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of the sensor gain range that is allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinIris" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of the iris range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxIris" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of the iris range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ExposureTime" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed exposure time used by the image sensor (&#956;s).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Gain" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed gain used by the image sensor (dB).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Iris" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed attenuation of input light affected by the iris (dB). 0dB maps to a fully opened iris.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ToneCompensation">
-		<xs:sequence>
-			<xs:element name="Mode" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Parameter to enable/disable or automatic ToneCompensation feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional level parameter specified with unitless normalized value from 0.0 to +1.0.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ToneCompensationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ToneCompensationExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ToneCompensationMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="ON"/>
-			<xs:enumeration value="AUTO"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Defogging">
-		<xs:sequence>
-			<xs:element name="Mode" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Parameter to enable/disable or automatic Defogging feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional level parameter specified with unitless normalized value from 0.0 to +1.0.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:DefoggingExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DefoggingExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />   <!-- first ONVIF then Vendor -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="DefoggingMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="ON"/>
-			<xs:enumeration value="AUTO"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="NoiseReduction">
-		<xs:sequence>
-			<xs:element name="Level" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Level parameter specified with unitless normalized value from 0.0 to +1.0. Level=0 means no noise reduction or minimal noise reduction.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingOptions20">
-		<xs:sequence>
-			<xs:element name="BacklightCompensation" type="tt:BacklightCompensationOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Backlight Compensation.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Brightness" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Brightness.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ColorSaturation" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Color Saturation.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Contrast" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Contrast.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Exposure" type="tt:ExposureOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Exposure.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Focus" type="tt:FocusOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Focus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IrCutFilterModes" type="tt:IrCutFilterMode" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of IrCutFilterModes.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Sharpness" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Sharpness.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WideDynamicRange" type="tt:WideDynamicRangeOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of WideDynamicRange.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WhiteBalance" type="tt:WhiteBalanceOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of WhiteBalance.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingOptions20Extension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingOptions20Extension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="ImageStabilization" type="tt:ImageStabilizationOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Options of parameters for Image Stabilization feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingOptions20Extension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingOptions20Extension2">
-		<xs:sequence>
-			<xs:element name="IrCutFilterAutoAdjustment" type="tt:IrCutFilterAutoAdjustmentOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Options of parameters for adjustment of Ir cut filter auto mode.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingOptions20Extension3" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingOptions20Extension3">
-		<xs:sequence>
-			<xs:element name="ToneCompensationOptions" type="tt:ToneCompensationOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Options of parameters for Tone Compensation feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DefoggingOptions" type="tt:DefoggingOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Options of parameters for Defogging feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="NoiseReductionOptions" type="tt:NoiseReductionOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Options of parameter for Noise Reduction feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingOptions20Extension4" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingOptions20Extension4">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImageStabilizationOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ImageStabilizationMode" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Supported options of Image Stabilization mode parameter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Valid range of the Image Stabilization.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImageStabilizationOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImageStabilizationOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IrCutFilterAutoAdjustmentOptions">
-		<xs:sequence>
-			<xs:element name="BoundaryType" type="xs:string" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Supported options of boundary types for adjustment of Ir cut filter auto mode. The opptions shall be chosen from tt:IrCutFilterAutoBoundaryType. </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BoundaryOffset" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not boundary offset for toggling Ir cut filter is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ResponseTimeRange" type="tt:DurationRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported range of delay time for toggling Ir cut filter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:IrCutFilterAutoAdjustmentOptionsExtension" minOccurs="0" />
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax" />
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IrCutFilterAutoAdjustmentOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WideDynamicRangeOptions20">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WideDynamicMode" maxOccurs="unbounded"/>
-			<xs:element name="Level" type="tt:FloatRange" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="BacklightCompensationOptions20">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:BacklightCompensationMode" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				'ON' or 'OFF'
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Level range of BacklightCompensation.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ExposureOptions20">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ExposureMode" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				Exposure Mode
-				<ul>
-							<li>Auto – Enabled the exposure algorithm on the device.</li>
-							<li>Manual – Disabled exposure algorithm on the device.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Priority" type="tt:ExposurePriority" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				The exposure priority mode (low noise/framerate).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinExposureTime" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Minimum ExposureTime.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxExposureTime" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Maximum ExposureTime.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinGain" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Minimum Gain.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxGain" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Maximum Gain.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinIris" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Minimum Iris.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxIris" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Maximum Iris.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ExposureTime" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the ExposureTime.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Gain" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Gain.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Iris" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Iris.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MoveOptions20">
-		<xs:sequence>
-			<xs:element name="Absolute" type="tt:AbsoluteFocusOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges for the absolute control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Relative" type="tt:RelativeFocusOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges for the relative control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Continuous" type="tt:ContinuousFocusOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges for the continuous control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RelativeFocusOptions20">
-		<xs:sequence>
-			<xs:element name="Distance" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the distance.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the speed.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalance20">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WhiteBalanceMode">
-				<xs:annotation>
-					<xs:documentation>
-				'AUTO' or 'MANUAL'
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CrGain" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Rgain (unitless).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CbGain" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Bgain (unitless).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:WhiteBalance20Extension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalance20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusConfiguration20">
-		<xs:sequence>
-			<xs:element name="AutoFocusMode" type="tt:AutoFocusMode">
-				<xs:annotation>
-					<xs:documentation>
-						Mode of auto focus.
-						<ul>
-							<li>AUTO - The device automatically adjusts focus.</li>
-							<li>MANUAL - The device does not automatically adjust focus.</li>
-						</ul>
-						Note: for devices supporting both manual and auto operation at the same time manual operation may be supported even if the Mode parameter is set to Auto.
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DefaultSpeed" type="xs:float" minOccurs="0"/>
-			<xs:element name="NearLimit" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Parameter to set autofocus near limit (unit: meter).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FarLimit" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Parameter to set autofocus far limit (unit: meter).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:FocusConfiguration20Extension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusConfiguration20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalanceOptions20">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WhiteBalanceMode" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				Mode of WhiteBalance.
-				<ul>
-							<li>AUTO</li>
-							<li>MANUAL</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="YrGain" type="tt:FloatRange" minOccurs="0"/>
-			<xs:element name="YbGain" type="tt:FloatRange" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:WhiteBalanceOptions20Extension" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalanceOptions20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusOptions20">
-		<xs:sequence>
-			<xs:element name="AutoFocusModes" type="tt:AutoFocusMode" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-					Supported modes for auto focus.
-					<ul>
-						<li>AUTO - The device supports automatic focus adjustment.</li>
-						<li>MANUAL - The device supports manual focus adjustment.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DefaultSpeed" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-					Valid range of DefaultSpeed.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="NearLimit" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-					Valid range of NearLimit.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FarLimit" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-					Valid range of FarLimit.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:FocusOptions20Extension" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusOptions20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ToneCompensationOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="xs:string" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Supported options for Tone Compensation mode. Its options shall be chosen from tt:ToneCompensationMode Type.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not support Level parameter for Tone Compensation.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />   <!-- first ONVIF then Vendor -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DefoggingOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="xs:string" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Supported options for Defogging mode. Its options shall be chosen from tt:DefoggingMode Type.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not support Level parameter for Defogging.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />   <!-- first ONVIF then Vendor -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NoiseReductionOptions">
-		<xs:sequence>
-			<xs:element name="Level" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not support Level parameter for NoiseReduction.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />   <!-- first ONVIF then Vendor -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--===============================-->
-	<!--  End, Imaging Version 2.0 Related Types   -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--  Event and Analytics Types    -->
-	<!--===============================-->
-	<xs:simpleType name="TopicNamespaceLocation">
-		<xs:restriction base="xs:anyURI"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="PropertyOperation">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Initialized"/>
-			<xs:enumeration value="Deleted"/>
-			<xs:enumeration value="Changed"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:element name="Message">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="Source" type="tt:ItemList" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Token value pairs that triggered this message. Typically only one item is present.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="Key" type="tt:ItemList" minOccurs="0"/>
-				<xs:element name="Data" type="tt:ItemList" minOccurs="0"/>
-				<xs:element name="Extension" type="tt:MessageExtension" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="UtcTime" type="xs:dateTime" use="required"/>
-			<xs:attribute name="PropertyOperation" type="tt:PropertyOperation"/>
-			<xs:anyAttribute processContents="lax"/>
-		</xs:complexType>
-	</xs:element>
-	<!--===============================-->
-	<xs:complexType name="MessageExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ItemList">
-		<xs:annotation>
-			<xs:documentation>
-			List of parameters according to the corresponding ItemListDescription.
-			Each item in the list shall have a unique name.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="SimpleItem" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Value name pair as defined by the corresponding description.</xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:attribute name="Name" type="xs:string" use="required">
-						<xs:annotation>
-							<xs:documentation>Item name.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-					<xs:attribute name="Value" type="xs:anySimpleType" use="required">
-						<xs:annotation>
-							<xs:documentation>Item value. The type is defined in the corresponding description.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ElementItem" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Complex value structure.</xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##any" processContents="lax">
-							<xs:annotation>
-								<xs:documentation>XML tree contiaing the element value as defined in the corresponding description.</xs:documentation>
-							</xs:annotation>
-						</xs:any>
-					</xs:sequence>
-					<xs:attribute name="Name" type="xs:string" use="required">
-						<xs:annotation>
-							<xs:documentation>Item name.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ItemListExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ItemListExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--       Message Description     -->
-	<!--===============================-->
-	<xs:complexType name="MessageDescription">
-		<xs:sequence>
-			<xs:element name="Source" type="tt:ItemListDescription" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Set of tokens producing this message. The list may only contain SimpleItemDescription items.
-					The set of tokens identify the component within the WS-Endpoint, which is responsible for the producing the message.<br/>
-					For analytics events the token set shall include the VideoSourceConfigurationToken, the VideoAnalyticsConfigurationToken
-					and the name of the analytics module or rule.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Key" type="tt:ItemListDescription" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Describes optional message payload parameters that may be used as key. E.g. object IDs of tracked objects are conveyed as key.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Data" type="tt:ItemListDescription" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Describes the payload of the message.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:MessageDescriptionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="IsProperty" type="xs:boolean">
-			<xs:annotation>
-				<xs:documentation>Must be set to true when the described Message relates to a property. An alternative term of "property" is a "state" in contrast to a pure event, which contains relevant information for only a single point in time.<br/>Default is false.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MessageDescriptionExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ItemListDescription">
-		<xs:annotation>
-			<xs:documentation>
-			Describes a list of items. Each item in the list shall have a unique name.
-			The list is designed as linear structure without optional or unbounded elements.
-			Use ElementItems only when complex structures are inevitable.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="SimpleItemDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Description of a simple item. The type must be of cathegory simpleType (xs:string, xs:integer, xs:float, ...).</xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:attribute name="Name" type="xs:string" use="required">
-						<xs:annotation>
-							<xs:documentation>Item name. Must be unique within a list.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-					<xs:attribute name="Type" type="xs:QName" use="required"/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ElementItemDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            Description of a complex type. The Type must reference a defined type.
-          </xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:attribute name="Name" type="xs:string" use="required">
-						<xs:annotation>
-							<xs:documentation>Item name. Must be unique within a list.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-					<xs:attribute name="Type" type="xs:QName" use="required">
-						<xs:annotation>
-							<xs:documentation>The type of the item. The Type must reference a defined type.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ItemListDescriptionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ItemListDescriptionExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Polyline">
-		<xs:sequence>
-			<xs:element name="Point" type="tt:Vector" minOccurs="2" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Polyline" type="tt:Polyline"/>
-	<!--===============================-->
-	<xs:simpleType name="Direction">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Left"/>
-			<xs:enumeration value="Right"/>
-			<xs:enumeration value="Any"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--    Analytics Configuration    -->
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineConfiguration">
-		<xs:sequence>
-			<xs:element name="AnalyticsModule" type="tt:Config" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:AnalyticsEngineConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RuleEngineConfiguration">
-		<xs:sequence>
-			<xs:element name="Rule" type="tt:Config" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:RuleEngineConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RuleEngineConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Config">
-		<xs:sequence>
-			<xs:element name="Parameters" type="tt:ItemList">
-				<xs:annotation>
-					<xs:documentation>List of configuration parameters as defined in the correspding description.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="Name" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:documentation>Name of the configuration.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="Type" type="xs:QName" use="required">
-			<xs:annotation>
-				<xs:documentation>The Type attribute specifies the type of rule and shall be equal to value of one of Name attributes of ConfigDescription elements returned by GetSupportedRules and GetSupportedAnalyticsModules command.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ConfigDescription">
-		<xs:sequence>
-			<xs:element name="Parameters" type="tt:ItemListDescription">
-				<xs:annotation>
-					<xs:documentation>
-						List describing the configuration parameters. The names of the parameters must be unique. If possible SimpleItems
-						should be used to transport the information to ease parsing of dynamically defined messages by a client
-						application.
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Messages" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-						The analytics modules and rule engine produce Events, which must be listed within the Analytics Module Description. In order to do so
-						the structure of the Message is defined and consists of three groups: Source, Key, and Data. It is recommended to use SimpleItemDescriptions wherever applicable.
-						The name of all Items must be unique within all Items contained in any group of this Message.
-						Depending on the component multiple parameters or none may be needed to identify the component uniquely.
-					</xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:complexContent>
-						<xs:extension base="tt:MessageDescription">
-							<xs:sequence>
-								<xs:element name="ParentTopic" type="xs:string">
-									<xs:annotation>
-										<xs:documentation>
-											The ParentTopic labels the message (e.g. "nn:RuleEngine/LineCrossing"). The real message can extend the ParentTopic
-											by for example the name of the instaniated rule (e.g. "nn:RuleEngine/LineCrossing/corssMyFirstLine").
-											Even without knowing the complete topic name, the subscriber will be able to distiguish the
-											messages produced by different rule instances of the same type via the Source fields of the message.
-											There the name of the rule instance, which produced the message, must be listed.
-										</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:extension>
-					</xs:complexContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ConfigDescriptionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="Name" type="xs:QName" use="required">
-			<xs:annotation>
-				<xs:documentation>The Name attribute (e.g. "tt::LineDetector") uniquely identifies the type of rule, not a type definition in a schema.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ConfigDescriptionExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SupportedRules">
-		<xs:sequence>
-			<xs:element name="RuleContentSchemaLocation" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Lists the location of all schemas that are referenced in the rules.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RuleDescription" type="tt:ConfigDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of rules supported by the Video Analytics configuration..</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:SupportedRulesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SupportedRulesExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SupportedAnalyticsModules">
-		<xs:sequence>
-			<xs:element name="AnalyticsModuleContentSchemaLocation" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>It optionally contains a list of URLs that provide the location of schema files.
-        These schema files describe the types and elements used in the analytics module descriptions.
-        If the analytics module descriptions reference types or elements of the ONVIF schema file,
-        the ONVIF schema file MUST be explicitly listed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AnalyticsModuleDescription" type="tt:ConfigDescription" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:SupportedAnalyticsModulesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SupportedAnalyticsModulesExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PolygonConfiguration">
-		<xs:sequence>
-			<xs:element name="Polygon" type="tt:Polygon">
-				<xs:annotation>
-					<xs:documentation>Contains Polygon configuration for rule parameters</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PolylineArray">
-		<xs:sequence>
-			<xs:element name="Segment" type="tt:Polyline" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Contains array of Polyline</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PolylineArrayExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PolylineArrayExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PolylineArrayConfiguration">
-		<xs:sequence>
-			<xs:element name="PolylineArray" type="tt:PolylineArray">
-				<xs:annotation>
-					<xs:documentation>Contains PolylineArray configuration data</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MotionExpression">
-		<xs:sequence>
-			<xs:element name="Expression" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Motion Expression data structure contains motion expression which is based on Scene Descriptor schema with XPATH syntax. The Type argument could allow introduction of different dialects </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:attribute name="Type" type="xs:string"/>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MotionExpressionConfiguration">
-		<xs:sequence>
-			<xs:element name="MotionExpression" type="tt:MotionExpression">
-				<xs:annotation>
-					<xs:documentation>Contains Rule MotionExpression configuration</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CellLayout">
-		<xs:sequence>
-			<xs:element name="Transformation" type="tt:Transformation">
-				<xs:annotation>
-					<xs:documentation>Mapping of the cell grid to the Video frame. The cell grid is starting from the upper left corner and x dimension is going from left to right and the y dimension from up to down.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:attribute name="Columns" type="xs:integer" use="required">
-			<xs:annotation>
-				<xs:documentation>Number of columns of the cell grid (x dimension)</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="Rows" type="xs:integer" use="required">
-			<xs:annotation>
-				<xs:documentation>Number of rows of the cell grid (y dimension)</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--End, Event and Analytics Types -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--      Display Related Types  -->
-	<!--===============================-->
-	<xs:complexType name="PaneConfiguration">
-		<xs:annotation>
-			<xs:documentation>Configuration of the streaming and coding settings of a Video window.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="PaneName" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional name of the pane configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioOutputToken" type="tt:ReferenceToken" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device has audio outputs, this element contains a pointer to the audio output that is associated with the pane. A client
-can retrieve the available audio outputs of a device using the GetAudioOutputs command of the DeviceIO service.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioSourceToken" type="tt:ReferenceToken" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device has audio sources, this element contains a pointer to the audio source that is associated with this pane.
-The audio connection from a decoder device to the NVT is established using the backchannel mechanism. A client can retrieve the available audio sources of a device using the GetAudioSources command of the
-DeviceIO service.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioEncoderConfiguration" type="tt:AudioEncoderConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The configuration of the audio encoder including codec, bitrate
-and sample rate. </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ReceiverToken" type="tt:ReferenceToken" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>A pointer to a Receiver that has the necessary information to receive
-				data from a Transmitter. This Receiver can be connected and the network video decoder displays the received data on the specified outputs. A client can retrieve the available Receivers using the
-				GetReceivers command of the Receiver Service.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Token" type="tt:ReferenceToken">
-				<xs:annotation>
-					<xs:documentation>A unique identifier in the display device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PaneLayout">
-		<xs:annotation>
-			<xs:documentation>A pane layout describes one Video window of a display. It links a pane configuration to a region of the screen.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Pane" type="tt:ReferenceToken">
-				<xs:annotation>
-					<xs:documentation>Reference to the configuration of the streaming and coding parameters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Area" type="tt:Rectangle">
-				<xs:annotation>
-					<xs:documentation>Describes the location and size of the area on the monitor. The area coordinate values are espressed in normalized units [-1.0, 1.0].</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Layout">
-		<xs:annotation>
-			<xs:documentation>A layout describes a set of Video windows that are displayed simultaniously on a display. </xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="PaneLayout" type="tt:PaneLayout" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of panes assembling the display layout.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:LayoutExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="LayoutExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CodingCapabilities">
-		<xs:annotation>
-			<xs:documentation>This type contains the Audio and Video coding capabilities of a display service.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="AudioEncodingCapabilities" type="tt:AudioEncoderConfigurationOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device supports audio encoding this section describes the supported codecs and their configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioDecodingCapabilities" type="tt:AudioDecoderConfigurationOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device supports audio decoding this section describes the supported codecs and their settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoDecodingCapabilities" type="tt:VideoDecoderConfigurationOptions">
-				<xs:annotation>
-					<xs:documentation>This section describes the supported video codesc and their configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="LayoutOptions">
-		<xs:annotation>
-			<xs:documentation>The options supported for a display layout.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="PaneLayoutOptions" type="tt:PaneLayoutOptions" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Lists the possible Pane Layouts of the Video Output</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:LayoutOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="LayoutOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PaneLayoutOptions">
-		<xs:annotation>
-			<xs:documentation>Description of a pane layout describing a complete display layout.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Area" type="tt:Rectangle" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of areas assembling a layout. Coordinate values are in the range [-1.0, 1.0].</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PaneOptionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PaneOptionExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--      End, Display Related Types  -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   Receiver Types              -->
-	<!--===============================-->
-	<xs:complexType name="Receiver">
-		<xs:annotation>
-			<xs:documentation>
-			Description of a receiver, including its token and configuration.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Token" type="tt:ReferenceToken">
-				<xs:annotation>
-					<xs:documentation>Unique identifier of the receiver.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Configuration" type="tt:ReceiverConfiguration">
-				<xs:annotation>
-					<xs:documentation>Describes the configuration of the receiver.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ReceiverConfiguration">
-		<xs:annotation>
-			<xs:documentation>
-			Describes the configuration of a receiver.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ReceiverMode">
-				<xs:annotation>
-					<xs:documentation>The following connection modes are defined:</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MediaUri" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Details of the URI to which the receiver should connect.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StreamSetup" type="tt:StreamSetup">
-				<xs:annotation>
-					<xs:documentation>Stream connection parameters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ReceiverMode">
-		<xs:annotation>
-			<xs:documentation>
-			Specifies a receiver connection mode.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="AutoConnect">
-				<xs:annotation>
-					<xs:documentation>The receiver connects on demand, as required by consumers of the media streams.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="AlwaysConnect">
-				<xs:annotation>
-					<xs:documentation>The receiver attempts to maintain a persistent connection to the configured endpoint.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="NeverConnect">
-				<xs:annotation>
-					<xs:documentation>The receiver does not attempt to connect.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Unknown">
-				<xs:annotation>
-					<xs:documentation>This case should never happen.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="ReceiverState">
-		<xs:annotation>
-			<xs:documentation>
-			Specifies the current connection state of the receiver.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="NotConnected">
-				<xs:annotation>
-					<xs:documentation>The receiver is not connected.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Connecting">
-				<xs:annotation>
-					<xs:documentation>The receiver is attempting to connect.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Connected">
-				<xs:annotation>
-					<xs:documentation>The receiver is connected.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Unknown">
-				<xs:annotation>
-					<xs:documentation>This case should never happen.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="ReceiverStateInformation">
-		<xs:annotation>
-			<xs:documentation>
-			Contains information about a receiver's current state.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="State" type="tt:ReceiverState">
-				<xs:annotation>
-					<xs:documentation>The connection state of the receiver may have one of the following states: </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AutoCreated" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not the receiver was created automatically.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   End, Receiver Types         					  -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--         Storage Types         -->
-	<!--===============================-->
-	<xs:simpleType name="ReceiverReference">
-		<xs:restriction base="tt:ReferenceToken"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="RecordingReference">
-		<xs:restriction base="tt:ReferenceToken"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="SourceReference">
-		<xs:sequence>
-			<xs:element name="Token" type="tt:ReferenceToken"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:attribute name="Type" type="xs:anyURI" use="optional" default="http://www.onvif.org/ver10/schema/Receiver"/>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="TrackReference">
-		<xs:restriction base="tt:ReferenceToken"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Description">
-		<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="DateTimeRange">
-		<xs:sequence>
-			<xs:element name="From" type="xs:dateTime"/>
-			<xs:element name="Until" type="xs:dateTime"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingSummary">
-		<xs:sequence>
-			<xs:element name="DataFrom" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The earliest point in time where there is recorded data on the device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DataUntil" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The most recent point in time where there is recorded data on the device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="NumberRecordings" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The device contains this many recordings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SearchScope">
-		<xs:annotation>
-			<xs:documentation>A structure for defining a limited scope when searching in recorded data.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="IncludedSources" type="tt:SourceReference" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A list of sources that are included in the scope. If this list is included, only data from one of these sources shall be searched.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IncludedRecordings" type="tt:RecordingReference" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A list of recordings that are included in the scope. If this list is included, only data from one of these recordings shall be searched.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RecordingInformationFilter" type="tt:XPathExpression" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>An xpath expression used to specify what recordings to search. Only those recordings with an RecordingInformation structure that matches the filter shall be searched.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:SearchScopeExtension" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Extension point</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SearchScopeExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EventFilter">
-		<xs:complexContent>
-			<xs:extension base="wsnt:FilterType">
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPositionFilter">
-		<xs:sequence>
-			<xs:element name="MinPosition" type="tt:PTZVector">
-				<xs:annotation>
-					<xs:documentation>The lower boundary of the PTZ volume to look for.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxPosition" type="tt:PTZVector">
-				<xs:annotation>
-					<xs:documentation>The upper boundary of the PTZ volume to look for.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EnterOrExit" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>If true, search for when entering the specified PTZ volume.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataFilter">
-		<xs:sequence>
-			<xs:element name="MetadataStreamFilter" type="tt:XPathExpression"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="XPathExpression">
-		<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="FindRecordingResultList">
-		<xs:sequence>
-			<xs:element name="SearchState" type="tt:SearchState">
-				<xs:annotation>
-					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RecordingInformation" type="tt:RecordingInformation" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A RecordingInformation structure for each found recording matching the search.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindEventResultList">
-		<xs:sequence>
-			<xs:element name="SearchState" type="tt:SearchState">
-				<xs:annotation>
-					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Result" type="tt:FindEventResult" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A FindEventResult structure for each found event matching the search.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindEventResult">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>The recording where this event was found. Empty string if no recording is associated with this event.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TrackToken" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the track where this event was found. Empty string if no track is associated with this event.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Time" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The time when the event occured.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Event" type="wsnt:NotificationMessageHolderType">
-				<xs:annotation>
-					<xs:documentation>The description of the event.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StartStateEvent" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>If true, indicates that the event is a virtual event generated for this particular search session to give the state of a property at the start time of the search.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindPTZPositionResultList">
-		<xs:sequence>
-			<xs:element name="SearchState" type="tt:SearchState">
-				<xs:annotation>
-					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Result" type="tt:FindPTZPositionResult" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A FindPTZPositionResult structure for each found PTZ position matching the search.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindPTZPositionResult">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the recording containing the PTZ position.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TrackToken" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the metadata track containing the PTZ position.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Time" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The time when the PTZ position was valid.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Position" type="tt:PTZVector">
-				<xs:annotation>
-					<xs:documentation>The PTZ position.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindMetadataResultList">
-		<xs:sequence>
-			<xs:element name="SearchState" type="tt:SearchState">
-				<xs:annotation>
-					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Result" type="tt:FindMetadataResult" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A FindMetadataResult structure for each found set of Metadata matching the search.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindMetadataResult">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the recording containing the metadata.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TrackToken" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the metadata track containing the matching metadata.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Time" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The point in time when the matching metadata occurs in the metadata track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="SearchState">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Queued">
-				<xs:annotation>
-					<xs:documentation>The search is queued and not yet started.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Searching">
-				<xs:annotation>
-					<xs:documentation>The search is underway and not yet completed.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Completed">
-				<xs:annotation>
-					<xs:documentation>The search has been completed and no new results will be found.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Unknown">
-				<xs:annotation>
-					<xs:documentation>The state of the search is unknown. (This is not a valid response from GetSearchState.)</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="JobToken">
-		<xs:restriction base="tt:ReferenceToken"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RecordingInformation">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference"/>
-			<xs:element name="Source" type="tt:RecordingSourceInformation">
-				<xs:annotation>
-					<xs:documentation>
-					Information about the source of the recording. This gives a description of where the data in the recording comes from. Since a single
-					recording is intended to record related material, there is just one source. It is indicates the physical location or the
-					major data source for the recording. Currently the recordingconfiguration cannot describe each individual data source.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EarliestRecording" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="LatestRecording" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="Content" type="tt:Description"/>
-			<xs:element name="Track" type="tt:TrackInformation" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Basic information about the track. Note that a track may represent a single contiguous time span or consist of multiple slices.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RecordingStatus" type="tt:RecordingStatus"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingSourceInformation">
-		<xs:annotation>
-			<xs:documentation>
-				A set of informative desciptions of a data source. The Search searvice allows a client to filter on recordings based on information in this structure.
-			</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="SourceId" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>
-				Identifier for the source chosen by the client that creates the structure.
-				This identifier is opaque to the device. Clients may use any type of URI for this field. A device shall support at least 128 characters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Name" type="tt:Name">
-				<xs:annotation>
-					<xs:documentation>Informative user readable name of the source, e.g. "Camera23". A device shall support at least 20 characters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Location" type="tt:Description">
-				<xs:annotation>
-					<xs:documentation>Informative description of the physical location of the source, e.g. the coordinates on a map.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Description" type="tt:Description">
-				<xs:annotation>
-					<xs:documentation>Informative description of the source.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Address" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>URI provided by the service supplying data to be recorded. A device shall support at least 128 characters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="RecordingStatus">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Initiated"/>
-			<xs:enumeration value="Recording"/>
-			<xs:enumeration value="Stopped"/>
-			<xs:enumeration value="Removing"/>
-			<xs:enumeration value="Removed"/>
-			<xs:enumeration value="Unknown">
-				<xs:annotation>
-					<xs:documentation>This case should never happen.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="TrackInformation">
-		<xs:sequence>
-			<xs:element name="TrackToken" type="tt:TrackReference"/>
-			<xs:element name="TrackType" type="tt:TrackType">
-				<xs:annotation>
-					<xs:documentation>Type of the track: "Video", "Audio" or "Metadata".
-					The track shall only be able to hold data of that type.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Description" type="tt:Description">
-				<xs:annotation>
-					<xs:documentation>Informative description of the contents of the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DataFrom" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The start date and time of the oldest recorded data in the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DataTo" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The stop date and time of the newest recorded data in the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="TrackType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Video"/>
-			<xs:enumeration value="Audio"/>
-			<xs:enumeration value="Metadata"/>
-			<xs:enumeration value="Extended">
-				<xs:annotation>
-					<xs:documentation>Placeholder for future extension.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="MediaAttributes">
-		<xs:annotation>
-			<xs:documentation>A set of media attributes valid for a recording at a point in time or for a time interval.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the recording that has these attributes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TrackAttributes" type="tt:TrackAttributes" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A set of attributes for each track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="From" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The attributes are valid from this point in time in the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Until" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The attributes are valid until this point in time in the recording. Can be equal to 'From' to indicate that the attributes are only known to be valid for this particular point in time.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="TrackAttributes">
-		<xs:sequence>
-			<xs:element name="TrackInformation" type="tt:TrackInformation">
-				<xs:annotation>
-					<xs:documentation>The basic information about the track. Note that a track may represent a single contiguous time span or consist of multiple slices.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoAttributes" type="tt:VideoAttributes" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the track is a video track, exactly one of this structure shall be present and contain the video attributes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioAttributes" type="tt:AudioAttributes" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the track is an audio track, exactly one of this structure shall be present and contain the audio attributes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MetadataAttributes" type="tt:MetadataAttributes" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the track is an metadata track, exactly one of this structure shall be present and contain the metadata attributes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:TrackAttributesExtension" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation/>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="TrackAttributesExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoAttributes">
-		<xs:sequence>
-			<xs:element name="Bitrate" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Average bitrate in kbps.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Width" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The width of the video in pixels.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Height" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The height of the video in pixels.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Encoding" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Video encoding of the track. Use values from tt:VideoEncoding for JPEG, MPEG4 and H264. Otherwise use type definitions as defined by <a href="http://www.iana.org/assignments/media-types/media-types.xhtml">IANA</a>.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Framerate" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Average framerate in frames per second.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioAttributes">
-		<xs:sequence>
-			<xs:element name="Bitrate" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The bitrate in kbps.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Encoding" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Audio encoding of the track. Use values from tt:AudioEncoding for G711, G726, AAC. Otherwise use type definitions as defined by <a href="http://www.iana.org/assignments/media-types/media-types.xhtml">IANA</a>.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Samplerate" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The sample rate in kHz.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataAttributes">
-		<xs:sequence>
-			<xs:element name="CanContainPTZ" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates that there can be PTZ data in the metadata track in the specified time interval.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CanContainAnalytics" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates that there can be analytics data in the metadata track in the specified time interval.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CanContainNotifications" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates that there can be notifications in the metadata track in the specified time interval.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="PtzSpaces" type="tt:StringAttrList">
-			<xs:annotation>
-				<xs:documentation>List of all PTZ spaces active for recording. Note that events are only recorded on position changes and the actual point of recording may not necessarily contain an event of the specified type. </xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--         RecordingService Types         		  -->
-	<!--===============================-->
-	<!--===============================-->
-	<xs:simpleType name="RecordingJobReference">
-		<xs:restriction base="tt:ReferenceToken"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RecordingConfiguration">
-		<xs:sequence>
-			<xs:element name="Source" type="tt:RecordingSourceInformation">
-				<xs:annotation>
-					<xs:documentation>Information about the source of the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Content" type="tt:Description">
-				<xs:annotation>
-					<xs:documentation>Informative description of the source.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaximumRetentionTime" type="xs:duration">
-				<xs:annotation>
-					<xs:documentation>Sspecifies the maximum time that data in any track within the
-				recording shall be stored. The device shall delete any data older than the maximum retention
-				time. Such data shall not be accessible anymore. If the MaximumRetentionPeriod is set to 0,
-				the device shall not limit the retention time of stored data, except by resource constraints.
-				Whatever the value of MaximumRetentionTime, the device may automatically delete
-				recordings to free up storage space for new recordings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="TrackConfiguration">
-		<xs:sequence>
-			<xs:element name="TrackType" type="tt:TrackType">
-				<xs:annotation>
-					<xs:documentation>Type of the track. It shall be equal to the strings “Video”,
-				“Audio” or “Metadata”. The track shall only be able to hold data of that type.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Description" type="tt:Description">
-				<xs:annotation>
-					<xs:documentation>Informative description of the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="GetRecordingsResponseItem">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>Token of the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Configuration" type="tt:RecordingConfiguration">
-				<xs:annotation>
-					<xs:documentation>Configuration of the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Tracks" type="tt:GetTracksResponseList">
-				<xs:annotation>
-					<xs:documentation>List of tracks.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="GetTracksResponseList">
-		<xs:sequence>
-			<xs:element name="Track" type="tt:GetTracksResponseItem" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Configuration of a track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="GetTracksResponseItem">
-		<xs:sequence>
-			<xs:element name="TrackToken" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>Token of the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Configuration" type="tt:TrackConfiguration">
-				<xs:annotation>
-					<xs:documentation>Configuration of the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobConfiguration">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>Identifies the recording to which this job shall store the received data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Mode" type="tt:RecordingJobMode">
-				<xs:annotation>
-					<xs:documentation>The mode of the job. If it is idle, nothing shall happen. If it is active, the device shall try
-				to obtain data from the receivers. A client shall use GetRecordingJobState to determine if data transfer is really taking place.<br/>
-				The only valid values for Mode shall be “Idle” and “Active”.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Priority" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>This shall be a non-negative number. If there are multiple recording jobs that store data to
-				the same track, the device will only store the data for the recording job with the highest
-				priority. The priority is specified per recording job, but the device shall determine the priority
-				of each track individually. If there are two recording jobs with the same priority, the device
-				shall record the data corresponding to the recording job that was activated the latest.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Source" type="tt:RecordingJobSource" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Source of the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RecordingJobConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="RecordingJobMode">
-		<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobSource">
-		<xs:sequence>
-			<xs:element name="SourceToken" type="tt:SourceReference" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>This field shall be a reference to the source of the data. The type of the source
-				is determined by the attribute Type in the SourceToken structure. If Type is
-				http://www.onvif.org/ver10/schema/Receiver, the token is a ReceiverReference. In this case
-				the device shall receive the data over the network. If Type is
-				http://www.onvif.org/ver10/schema/Profile, the token identifies a media profile, instructing the
-				device to obtain data from a profile that exists on the local device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AutoCreateReceiver" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If this field is TRUE, and if the SourceToken is omitted, the device
-				shall create a receiver object (through the receiver service) and assign the
-				ReceiverReference to the SourceToken field. When retrieving the RecordingJobConfiguration
-				from the device, the AutoCreateReceiver field shall never be present.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Tracks" type="tt:RecordingJobTrack" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of tracks associated with the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RecordingJobSourceExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobSourceExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobTrack">
-		<xs:sequence>
-			<xs:element name="SourceTag" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>If the received RTSP stream contains multiple tracks of the same type, the
-						SourceTag differentiates between those Tracks. This field can be ignored in case of recording a local source.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Destination" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>The destination is the tracktoken of the track to which the device shall store the
-				received data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobStateInformation">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>Identification of the recording that the recording job records to.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="State" type="tt:RecordingJobState">
-				<xs:annotation>
-					<xs:documentation>Holds the aggregated state over the whole RecordingJobInformation structure.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Sources" type="tt:RecordingJobStateSource" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Identifies the data source of the recording job.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RecordingJobStateInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobStateInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="RecordingJobState">
-		<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobStateSource">
-		<xs:sequence>
-			<xs:element name="SourceToken" type="tt:SourceReference">
-				<xs:annotation>
-					<xs:documentation>Identifies the data source of the recording job.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="State" type="tt:RecordingJobState">
-				<xs:annotation>
-					<xs:documentation>Holds the aggregated state over all substructures of RecordingJobStateSource.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Tracks" type="tt:RecordingJobStateTracks">
-				<xs:annotation>
-					<xs:documentation>List of track items.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobStateTracks">
-		<xs:sequence>
-			<xs:element name="Track" type="tt:RecordingJobStateTrack" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobStateTrack">
-		<xs:sequence>
-			<xs:element name="SourceTag" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Identifies the track of the data source that provides the data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Destination" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>Indicates the destination track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Error" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optionally holds an implementation defined string value that describes the error.
-				The string should be in the English language.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="State" type="tt:RecordingJobState">
-				<xs:annotation>
-					<xs:documentation>Provides the job state of the track. The valid
-				values of state shall be “Idle”, “Active” and “Error”. If state equals “Error”, the Error field may be filled in with an implementation defined value.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="GetRecordingJobsResponseItem">
-		<xs:sequence>
-			<xs:element name="JobToken" type="tt:RecordingJobReference"/>
-			<xs:element name="JobConfiguration" type="tt:RecordingJobConfiguration"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--         End, RecordingService Types         		  -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--         Replay Types         		  -->
-	<!--===============================-->
-	<xs:complexType name="ReplayConfiguration">
-		<xs:annotation>
-			<xs:documentation>
-      Configuration parameters for the replay service.
-    </xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="SessionTimeout" type="xs:duration">
-				<xs:annotation>
-					<xs:documentation>The RTSP session timeout.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--         End, Replay Types         		  -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--         Analytics Device Types         -->
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngine">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="AnalyticsEngineConfiguration" type="tt:AnalyticsDeviceEngineConfiguration"/>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsDeviceEngineConfiguration">
-		<xs:sequence>
-			<xs:element name="EngineConfiguration" type="tt:EngineConfiguration" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:AnalyticsDeviceEngineConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsDeviceEngineConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EngineConfiguration">
-		<xs:sequence>
-			<xs:element name="VideoAnalyticsConfiguration" type="tt:VideoAnalyticsConfiguration"/>
-			<xs:element name="AnalyticsEngineInputInfo" type="tt:AnalyticsEngineInputInfo"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineInputInfo">
-		<xs:sequence>
-			<xs:element name="InputInfo" type="tt:Config" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:AnalyticsEngineInputInfoExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineInputInfoExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineInput">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="SourceIdentification" type="tt:SourceIdentification"/>
-					<xs:element name="VideoInput" type="tt:VideoEncoderConfiguration"/>
-					<xs:element name="MetadataInput" type="tt:MetadataInput"/>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SourceIdentification">
-		<xs:sequence>
-			<xs:element name="Name" type="xs:string"/>
-			<xs:element name="Token" type="tt:ReferenceToken" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:SourceIdentificationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SourceIdentificationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataInput">
-		<xs:sequence>
-			<xs:element name="MetadataConfig" type="tt:Config" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:MetadataInputExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataInputExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineControl">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="EngineToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Token of the analytics engine (AnalyticsEngine) being controlled.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="EngineConfigToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Token of the analytics engine configuration (VideoAnalyticsConfiguration) in effect.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="InputToken" type="tt:ReferenceToken" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>Tokens of the input (AnalyticsEngineInput) configuration applied.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="ReceiverToken" type="tt:ReferenceToken" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>Tokens of the receiver providing media input data. The order of ReceiverToken shall exactly match the order of InputToken.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Multicast" type="tt:MulticastConfiguration" minOccurs="0"/>
-					<xs:element name="Subscription" type="tt:Config"/>
-					<xs:element name="Mode" type="tt:ModeOfOperation"/>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ModeOfOperation">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Idle"/>
-			<xs:enumeration value="Active"/>
-			<xs:enumeration value="Unknown">
-				<xs:annotation>
-					<xs:documentation>This case should never happen.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsStateInformation">
-		<xs:sequence>
-			<xs:element name="AnalyticsEngineControlToken" type="tt:ReferenceToken">
-				<xs:annotation>
-					<xs:documentation>Token of the control object whose status is requested.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="State" type="tt:AnalyticsState"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsState">
-		<xs:sequence>
-			<xs:element name="Error" type="xs:string" minOccurs="0"/>
-			<xs:element name="State" type="xs:string"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--         End, Analytics Device Types         -->
-	<!--===============================-->
-	<!--=========================================-->
-	<!--  Action event payload Types   -->
-	<!--=========================================-->
-	<!--===============================-->
-	<xs:complexType name="ActionEngineEventPayload">
-		<xs:annotation>
-			<xs:documentation>Action Engine Event Payload data structure contains the information about the ONVIF command invocations. Since this event could be generated by other or proprietary actions, the command invocation specific fields are defined as optional and additional extension mechanism is provided for future or additional action definitions.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="RequestInfo" type="soapenv:Envelope" minOccurs="0" maxOccurs="1">
-				<xs:annotation>
-					<xs:documentation>Request Message</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ResponseInfo" type="soapenv:Envelope" minOccurs="0" maxOccurs="1">
-				<xs:annotation>
-					<xs:documentation>Response Message</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Fault" type="soapenv:Fault" minOccurs="0" maxOccurs="1">
-				<xs:annotation>
-					<xs:documentation>Fault Message</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ActionEngineEventPayloadExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ActionEngineEventPayloadExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--=========================================-->
-	<!--  End, Action event payload Types   -->
-	<!--=========================================-->
-        <!--=========================================-->
-	<!--  Begin, Audio event types               -->
-	<!--=========================================-->
-	<xs:simpleType name="AudioClassType">
-		<xs:annotation>
-		<xs:documentation>
-		  AudioClassType acceptable values are;
-		   gun_shot, scream, glass_breaking, tire_screech   
-		</xs:documentation>
-		</xs:annotation>
-	<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-
-	<xs:complexType name="AudioClassCandidate">
-	<xs:sequence>
-		<xs:element name="Type" type="tt:AudioClassType">
-			<xs:annotation>
-			<xs:documentation>Indicates audio class label</xs:documentation>
-			</xs:annotation>
-		</xs:element> 
- 		<xs:element name="Likelihood" type="xs:float">
-			<xs:annotation>
-			<xs:documentation>A likelihood/probability that the corresponding audio event belongs to this class. The sum of the likelihoods shall NOT exceed 1</xs:documentation>
-			</xs:annotation>
-		</xs:element>  
-		<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-	</xs:sequence>
-	<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-
-	<xs:complexType name="AudioClassDescriptor">
-	<xs:sequence>
-		<xs:element name="ClassCandidate" type="tt:AudioClassCandidate" minOccurs="0" maxOccurs="unbounded">
-			<xs:annotation>
-			<xs:documentation>Array of audio class label and class probability</xs:documentation>
-			</xs:annotation>
-		</xs:element>
-		<xs:element name="Extension" type="tt:AudioClassDescriptorExtension" minOccurs="0"/>
-	</xs:sequence>
-	<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<xs:complexType name="AudioClassDescriptorExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--=========================================-->
-	<!--  End, Audio event types                 -->
-	<!--=========================================-->
-	<!--=========================================-->
-	<!--  Begin, Media event types               -->
-	<!--=========================================-->
-	<xs:complexType name="ActiveConnection">
-		<xs:sequence>
-			<xs:element name="CurrentBitrate" type="xs:float"/>
-			<xs:element name="CurrentFps" type="xs:float"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ProfileStatus">
-		<xs:sequence>
-			<xs:element name="ActiveConnections" type="tt:ActiveConnection" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:ProfileStatusExtension" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ProfileStatusExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--=========================================-->
-	<!--  End, Media event types                 -->
-	<!--=========================================-->
-	<!--==================================-->
-	<!--  Begin, OSD Device Types         -->
-	<!--==================================-->
-	<xs:complexType name="OSDReference">
-		<xs:simpleContent>
-			<xs:extension base="tt:ReferenceToken">
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="OSDType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Text"/>
-			<xs:enumeration value="Image"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="OSDPosConfiguration">
-		<xs:sequence>
-			<xs:element name="Type" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>For OSD position type, following are the pre-defined: <ul><li>UpperLeft</li>
-						<li>UpperRight</li>
-						<li>LowerLeft</li>
-						<li>LowerRight</li>
-						<li>Custom</li></ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Pos" type="tt:Vector" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:OSDPosConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDPosConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDColor">
-		<xs:annotation>
-			<xs:documentation>The value range of "Transparent" could be defined by vendors only should follow this rule: the minimum value means non-transparent and the maximum value maens fully transparent.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Color" type="tt:Color"/>
-		</xs:sequence>
-		<xs:attribute name="Transparent" type="xs:int" use="optional"/>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDTextConfiguration">
-		<xs:sequence>
-			<xs:element name="Type" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>
-						The following OSD Text Type are defined:<ul>
-							<li>Plain - The Plain type means the OSD is shown as a text string which defined in the "PlainText" item.</li>
-							<li>Date - The Date type means the OSD is shown as a date, format of which should be present in the "DateFormat" item.</li>
-							<li>Time - The Time type means the OSD is shown as a time, format of which should be present in the "TimeFormat" item.</li>
-							<li>DateAndTime - The DateAndTime type means the OSD is shown as date and time, format of which should be present in the "DateFormat" and the "TimeFormat" item.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DateFormat" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-						List of supported OSD date formats. This element shall be present when the value of Type field has Date or DateAndTime. The following DateFormat are defined:<ul>
-							<li>M/d/yyyy - e.g. 3/6/2013</li>
-							<li>MM/dd/yyyy - e.g. 03/06/2013</li>
-							<li>dd/MM/yyyy - e.g. 06/03/2013</li>
-							<li>yyyy/MM/dd - e.g. 2013/03/06</li>
-							<li>yyyy-MM-dd - e.g. 2013-06-03</li>
-							<li>dddd, MMMM dd, yyyy - e.g. Wednesday, March 06, 2013</li>
-							<li>MMMM dd, yyyy - e.g. March 06, 2013</li>
-							<li>dd MMMM, yyyy - e.g. 06 March, 2013</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TimeFormat" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-						List of supported OSD time formats. This element shall be present when the value of Type field has Time or DateAndTime. The following TimeFormat are defined:<ul>
-							<li>h:mm:ss tt - e.g. 2:14:21 PM</li>
-							<li>hh:mm:ss tt - e.g. 02:14:21 PM</li>
-							<li>H:mm:ss - e.g. 14:14:21</li>
-							<li>HH:mm:ss - e.g. 14:14:21</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FontSize" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Font size of the text in pt.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FontColor" type="tt:OSDColor" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Font color of the text.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BackgroundColor" type="tt:OSDColor" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Background color of the text.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PlainText" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The content of text to be displayed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDTextConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDTextConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDImgConfiguration">
-		<xs:sequence>
-			<xs:element name="ImgPath" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>The URI of the image which to be displayed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDImgConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDImgConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ColorspaceRange">
-		<xs:sequence>
-			<xs:element name="X" type="tt:FloatRange"/>
-			<xs:element name="Y" type="tt:FloatRange"/>
-			<xs:element name="Z" type="tt:FloatRange"/>
-			<xs:element name="Colorspace" type="xs:anyURI"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ColorOptions">
-		<xs:annotation>
-			<xs:documentation>Describe the option of the color supported. Either list each color or define the range of color value. The following values are acceptable for Colourspace attribute.<ul><li>http://www.onvif.org/ver10/colorspace/YCbCr - YCbCr colourspace</li>
-				<li>http://www.onvif.org/ver10/colorspace/CIELUV - CIE LUV</li>
-				<li>http://www.onvif.org/ver10/colorspace/CIELAB - CIE 1976 (L*a*b*)</li>
-				<li>http://www.onvif.org/ver10/colorspace/HSV - HSV colourspace</li></ul>
-			</xs:documentation>
-		</xs:annotation>
-		<xs:choice>
-			<xs:element name="ColorList" type="tt:Color" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List the supported color.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ColorspaceRange" type="tt:ColorspaceRange" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Define the rang of color supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:choice>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDColorOptions">
-		<xs:annotation>
-			<xs:documentation>Describe the option of the color and its transparency.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Color" type="tt:ColorOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional list of supported colors.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Transparent" type="tt:IntRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Range of the transparent level. Larger means more tranparent.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDColorOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDColorOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDTextOptions">
-		<xs:sequence>
-			<xs:element name="Type" type="xs:string" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported OSD text type. When a device indicates the supported number relating to Text type in MaximumNumberOfOSDs, the type shall be presented.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FontSizeRange" type="tt:IntRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Range of the font size value.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DateFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported date format.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TimeFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported time format.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FontColor" type="tt:OSDColorOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>List of supported font color.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BackgroundColor" type="tt:OSDColorOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>List of supported background color.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDTextOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDTextOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDImgOptions">
-		<xs:sequence>
-			<xs:element name="ImagePath" type="xs:anyURI" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of avaiable uris of image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDImgOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDImgOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="VideoSourceConfigurationToken" type="tt:OSDReference">
-						<xs:annotation>
-							<xs:documentation>Reference to the video source configuration.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Type" type="tt:OSDType">
-						<xs:annotation>
-							<xs:documentation>Type of OSD.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Position" type="tt:OSDPosConfiguration">
-						<xs:annotation>
-							<xs:documentation>Position configuration of OSD.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TextString" type="tt:OSDTextConfiguration" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Text configuration of OSD. It shall be present when the value of Type field is Text.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Image" type="tt:OSDImgConfiguration" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Image configuration of OSD. It shall be present when the value of Type field is Image</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:OSDConfigurationExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MaximumNumberOfOSDs">
-		<xs:attribute name="Total" type="xs:int" use="required"/>
-		<xs:attribute name="Image" type="xs:int"/>
-		<xs:attribute name="PlainText" type="xs:int"/>
-		<xs:attribute name="Date" type="xs:int"/>
-		<xs:attribute name="Time" type="xs:int"/>
-		<xs:attribute name="DateAndTime" type="xs:int"/>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="MaximumNumberOfOSDs" type="tt:MaximumNumberOfOSDs">
-				<xs:annotation>
-					<xs:documentation>The maximum number of OSD configurations supported for the specificate video source configuration. If a device limits the number of instances by OSDType, it should indicate the supported number via the related attribute.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Type" type="tt:OSDType" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List supported type of OSD configuration. When a device indicates the supported number for each types in MaximumNumberOfOSDs, related type shall be presented. A device shall return Option element relating to listed type.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PositionOption" type="xs:string" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List available OSD position type. Following are the pre-defined:<ul><li>UpperLeft</li>
-						<li>UpperRight</li>
-						<li>LowerLeft</li>
-						<li>LowerRight</li>
-						<li>Custom</li></ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TextOption" type="tt:OSDTextOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Option of the OSD text configuration. This element shall be returned if the device is signaling the support for Text.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ImageOption" type="tt:OSDImgOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Option of the OSD image configuration. This element shall be returned if the device is signaling the support for Image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDConfigurationOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDConfigurationOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--=========================================-->
-	<!--  End, OSD Device Types                  -->
-	<!--=========================================-->
-
-	<!--=========================================-->
-	<!--  Begin, StorageConfiguration            -->
-	<!--=========================================-->
-	<xs:complexType name="FileProgress">
-    	<xs:sequence>
-    		<xs:element name="FileName" type="xs:string">
-    			<xs:annotation>
-    				<xs:documentation>Exported file name</xs:documentation>
-    			</xs:annotation>
-    		</xs:element>
-    		<xs:element name="Progress" type="xs:float">
-    			<xs:annotation>
-    				<xs:documentation>Normalized percentage completion for uploading the exported file</xs:documentation>
-    			</xs:annotation>
-    		</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-    </xs:complexType>
-
-	<xs:complexType name="ArrayOfFileProgress">
-    	<xs:sequence>
-    		<xs:element name="FileProgress" type="tt:FileProgress" minOccurs="0" maxOccurs="unbounded">
-    			<xs:annotation>
-    				<xs:documentation>Exported file name and export progress information</xs:documentation>
-    			</xs:annotation>
-    		</xs:element>
-			<xs:element name="Extension" type="tt:ArrayOfFileProgressExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-    </xs:complexType>
-	<xs:complexType name="ArrayOfFileProgressExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-
-	<xs:complexType name="StorageReferencePath">
-    	<xs:sequence>
-    		<xs:element name="StorageToken" type="tt:ReferenceToken">
-    			<xs:annotation>
-    				<xs:documentation>identifier of an existing Storage Configuration.</xs:documentation>
-    			</xs:annotation>
-    		</xs:element>
-    		<xs:element name="RelativePath" type="xs:string" minOccurs="0">
-    			<xs:annotation>
-    				<xs:documentation>gives the relative directory path on the storage</xs:documentation>
-    			</xs:annotation>
-    		</xs:element>
-			<xs:element name="Extension" type="tt:StorageReferencePathExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-    </xs:complexType>
-	<xs:complexType name="StorageReferencePathExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>   <!-- first Vendor then ONVIF -->
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--=========================================-->
-	<!--  End, StorageConfiguration              -->
-	<!--=========================================-->
-</xs:schema>
diff --git a/src/onvif_srvd/onvif_srvd/wsdl/ptz.wsdl b/src/onvif_srvd/onvif_srvd/wsdl/ptz.wsdl
deleted file mode 100644
index 4540e7b..0000000
--- a/src/onvif_srvd/onvif_srvd/wsdl/ptz.wsdl
+++ /dev/null
@@ -1,1292 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="../../../ver20/util/onvif-wsdl-viewer.xsl"?>
-<!--
-Copyright (c) 2008-2012 by ONVIF: Open Network Video Interface Forum. All rights reserved.
-
-Recipients of this document may copy, distribute, publish, or display this document so long as this copyright notice, license and disclaimer are retained with all copies of the document. No license is granted to modify this document.
-
-THIS DOCUMENT IS PROVIDED "AS IS," AND THE CORPORATION AND ITS MEMBERS AND THEIR AFFILIATES, MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THIS DOCUMENT ARE SUITABLE FOR ANY PURPOSE; OR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT, WHETHER OR NOT (1) THE CORPORATION, MEMBERS OR THEIR AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR (2) SUCH DAMAGES WERE REASONABLY FORESEEABLE, AND ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT.  THE FOREGOING DISCLAIMER AND LIMITATION ON LIABILITY DO NOT APPLY TO, INVALIDATE, OR LIMIT REPRESENTATIONS AND WARRANTIES MADE BY THE MEMBERS AND THEIR RESPECTIVE AFFILIATES TO THE CORPORATION AND OTHER MEMBERS IN CERTAIN WRITTEN POLICIES OF THE CORPORATION.
--->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tptz="http://www.onvif.org/ver20/ptz/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap12/" name="PTZService" targetNamespace="http://www.onvif.org/ver20/ptz/wsdl">
-	<wsdl:types>
-		<xs:schema targetNamespace="http://www.onvif.org/ver20/ptz/wsdl" xmlns:tt="http://www.onvif.org/ver10/schema" xmlns:tptz="http://www.onvif.org/ver20/ptz/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="2.4">
-			<xs:import namespace="http://www.onvif.org/ver10/schema" schemaLocation="../../../ver10/schema/onvif.xsd"/>
-			<!--  Message Request/Responses elements  -->
-			<!--===============================-->
-			<xs:element name="GetServiceCapabilities">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetServiceCapabilitiesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Capabilities" type="tptz:Capabilities">
-							<xs:annotation>
-								<xs:documentation>The capabilities for the PTZ service is returned in the Capabilities element.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:complexType name="Capabilities">
-				<xs:sequence>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:attribute name="EFlip" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates whether or not EFlip is supported.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="Reverse" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates whether or not reversing of PT control direction is supported.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="GetCompatibleConfigurations" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for the GetCompatibleConfigurations command.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<xs:element name="Capabilities" type="tptz:Capabilities"/>
-			<!--===============================-->
-			<xs:element name="GetNodes">
-				<xs:complexType/>
-			</xs:element>
-			<xs:element name="GetNodesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZNode" type="tt:PTZNode" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>A list of the existing PTZ Nodes on the device.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetNode">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NodeToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested PTZNode.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetNodeResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZNode" type="tt:PTZNode">
-							<xs:annotation>
-								<xs:documentation>A requested PTZNode.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetConfigurations">
-				<xs:complexType/>
-			</xs:element>
-			<xs:element name="GetConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZConfiguration" type="tt:PTZConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>A list of all existing PTZConfigurations on the device.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested PTZConfiguration.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZConfiguration" type="tt:PTZConfiguration">
-							<xs:annotation>
-								<xs:documentation>A requested PTZConfiguration.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZConfiguration" type="tt:PTZConfiguration">
-							<xs:annotation>
-								<xs:documentation>
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>Flag that makes configuration persistent. Example: User wants the configuration to exist after reboot.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence minOccurs="0"/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetConfigurationOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of an existing configuration that the options are intended for.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetConfigurationOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZConfigurationOptions" type="tt:PTZConfigurationOptions">
-							<xs:annotation>
-								<xs:documentation>The requested PTZ configuration options.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SendAuxiliaryCommand">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile where the operation should take place.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="AuxiliaryData" type="tt:AuxiliaryData">
-							<xs:annotation>
-								<xs:documentation>The Auxiliary request data.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SendAuxiliaryCommandResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="AuxiliaryResponse" type="tt:AuxiliaryData">
-							<xs:annotation>
-								<xs:documentation>The response contains the auxiliary response.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetPresets">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile where the operation should take place.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetPresetsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Preset" type="tt:PTZPreset" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>A list of presets which are available for the requested MediaProfile.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetPreset">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile where the operation should take place.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="PresetName" type="xs:string" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>A requested preset name.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="PresetToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>A requested preset token.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetPresetResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PresetToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A token to the Preset which has been set.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemovePreset">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile where the operation should take place.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="PresetToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A requested preset token.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemovePresetResponse">
-				<xs:complexType/>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GotoPreset">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile where the operation should take place.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="PresetToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A requested preset token.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Speed" type="tt:PTZSpeed" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>A requested speed.The speed parameter can only be specified when Speed Spaces are available for the PTZ Node.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GotoPresetResponse">
-				<xs:complexType/>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetStatus">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile where the PTZStatus should be requested.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetStatusResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZStatus" type="tt:PTZStatus">
-							<xs:annotation>
-								<xs:documentation>The PTZStatus for the requested MediaProfile.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GotoHomePosition">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile where the operation should take place.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Speed" type="tt:PTZSpeed" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>A requested speed.The speed parameter can only be specified when Speed Spaces are available for the PTZ Node.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GotoHomePositionResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetHomePosition">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile where the home position should be set.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetHomePositionResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="ContinuousMove">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Velocity" type="tt:PTZSpeed">
-							<xs:annotation>
-								<xs:documentation>A Velocity vector specifying the velocity of pan, tilt and zoom.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Timeout" type="xs:duration" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>An optional Timeout parameter.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ContinuousMoveResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RelativeMove">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Translation" type="tt:PTZVector">
-							<xs:annotation>
-								<xs:documentation>A positional Translation relative to the current position
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Speed" type="tt:PTZSpeed" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>An optional Speed parameter.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RelativeMoveResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AbsoluteMove">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Position" type="tt:PTZVector">
-							<xs:annotation>
-								<xs:documentation>A Position vector specifying the absolute target position.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Speed" type="tt:PTZSpeed" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>An optional Speed.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AbsoluteMoveResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="Stop">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile that indicate what should be stopped.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="PanTilt" type="xs:boolean" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Set true when we want to stop ongoing pan and tilt movements.If PanTilt arguments are not present, this command stops these movements.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Zoom" type="xs:boolean" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Set true when we want to stop ongoing zoom movement.If Zoom arguments are not present, this command stops ongoing zoom movement.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="StopResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetPresetTours">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetPresetToursResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PresetTour" type="tt:PresetTour" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetPresetTour">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
-						<xs:element name="PresetTourToken" type="tt:ReferenceToken"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetPresetTourResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PresetTour" type="tt:PresetTour"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetPresetTourOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
-						<xs:element name="PresetTourToken" type="tt:ReferenceToken" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetPresetTourOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Options" type="tt:PTZPresetTourOptions"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="CreatePresetTour">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CreatePresetTourResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PresetTourToken" type="tt:ReferenceToken"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="ModifyPresetTour">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
-						<xs:element name="PresetTour" type="tt:PresetTour"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ModifyPresetTourResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="OperatePresetTour">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
-						<xs:element name="PresetTourToken" type="tt:ReferenceToken"/>
-						<xs:element name="Operation" type="tt:PTZPresetTourOperation"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="OperatePresetTourResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemovePresetTour">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
-						<xs:element name="PresetTourToken" type="tt:ReferenceToken"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemovePresetTourResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCompatibleConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZConfiguration" type="tt:PTZConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>A list of all existing PTZConfigurations on the NVT that is suitable to be added to the addressed media profile.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-		</xs:schema>
-	</wsdl:types>
-	<wsdl:message name="GetServiceCapabilitiesRequest">
-		<wsdl:part name="parameters" element="tptz:GetServiceCapabilities"/>
-	</wsdl:message>
-	<wsdl:message name="GetServiceCapabilitiesResponse">
-		<wsdl:part name="parameters" element="tptz:GetServiceCapabilitiesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetNodesRequest">
-		<wsdl:part name="parameters" element="tptz:GetNodes"/>
-	</wsdl:message>
-	<wsdl:message name="GetNodesResponse">
-		<wsdl:part name="parameters" element="tptz:GetNodesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetNodeRequest">
-		<wsdl:part name="parameters" element="tptz:GetNode"/>
-	</wsdl:message>
-	<wsdl:message name="GetNodeResponse">
-		<wsdl:part name="parameters" element="tptz:GetNodeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetConfigurationsRequest">
-		<wsdl:part name="parameters" element="tptz:GetConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetConfigurationsResponse">
-		<wsdl:part name="parameters" element="tptz:GetConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetConfigurationRequest">
-		<wsdl:part name="parameters" element="tptz:GetConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetConfigurationResponse">
-		<wsdl:part name="parameters" element="tptz:GetConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetConfigurationRequest">
-		<wsdl:part name="parameters" element="tptz:SetConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetConfigurationResponse">
-		<wsdl:part name="parameters" element="tptz:SetConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetConfigurationOptionsRequest">
-		<wsdl:part name="parameters" element="tptz:GetConfigurationOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetConfigurationOptionsResponse">
-		<wsdl:part name="parameters" element="tptz:GetConfigurationOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetPresetsRequest">
-		<wsdl:part name="parameters" element="tptz:GetPresets"/>
-	</wsdl:message>
-	<wsdl:message name="GetPresetsResponse">
-		<wsdl:part name="parameters" element="tptz:GetPresetsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetPresetRequest">
-		<wsdl:part name="parameters" element="tptz:SetPreset"/>
-	</wsdl:message>
-	<wsdl:message name="SetPresetResponse">
-		<wsdl:part name="parameters" element="tptz:SetPresetResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemovePresetRequest">
-		<wsdl:part name="parameters" element="tptz:RemovePreset"/>
-	</wsdl:message>
-	<wsdl:message name="RemovePresetResponse">
-		<wsdl:part name="parameters" element="tptz:RemovePresetResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GotoPresetRequest">
-		<wsdl:part name="parameters" element="tptz:GotoPreset"/>
-	</wsdl:message>
-	<wsdl:message name="GotoPresetResponse">
-		<wsdl:part name="parameters" element="tptz:GotoPresetResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetStatusRequest">
-		<wsdl:part name="parameters" element="tptz:GetStatus"/>
-	</wsdl:message>
-	<wsdl:message name="GetStatusResponse">
-		<wsdl:part name="parameters" element="tptz:GetStatusResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SendAuxiliaryCommandRequest">
-		<wsdl:part name="parameters" element="tptz:SendAuxiliaryCommand"/>
-	</wsdl:message>
-	<wsdl:message name="SendAuxiliaryCommandResponse">
-		<wsdl:part name="parameters" element="tptz:SendAuxiliaryCommandResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GotoHomePositionRequest">
-		<wsdl:part name="parameters" element="tptz:GotoHomePosition"/>
-	</wsdl:message>
-	<wsdl:message name="GotoHomePositionResponse">
-		<wsdl:part name="parameters" element="tptz:GotoHomePositionResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetHomePositionRequest">
-		<wsdl:part name="parameters" element="tptz:SetHomePosition"/>
-	</wsdl:message>
-	<wsdl:message name="SetHomePositionResponse">
-		<wsdl:part name="parameters" element="tptz:SetHomePositionResponse"/>
-	</wsdl:message>
-	<wsdl:message name="ContinuousMoveRequest">
-		<wsdl:part name="parameters" element="tptz:ContinuousMove"/>
-	</wsdl:message>
-	<wsdl:message name="ContinuousMoveResponse">
-		<wsdl:part name="parameters" element="tptz:ContinuousMoveResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RelativeMoveRequest">
-		<wsdl:part name="parameters" element="tptz:RelativeMove"/>
-	</wsdl:message>
-	<wsdl:message name="RelativeMoveResponse">
-		<wsdl:part name="parameters" element="tptz:RelativeMoveResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AbsoluteMoveRequest">
-		<wsdl:part name="parameters" element="tptz:AbsoluteMove"/>
-	</wsdl:message>
-	<wsdl:message name="AbsoluteMoveResponse">
-		<wsdl:part name="parameters" element="tptz:AbsoluteMoveResponse"/>
-	</wsdl:message>
-	<wsdl:message name="StopRequest">
-		<wsdl:part name="parameters" element="tptz:Stop"/>
-	</wsdl:message>
-	<wsdl:message name="StopResponse">
-		<wsdl:part name="parameters" element="tptz:StopResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetPresetToursRequest">
-		<wsdl:part name="parameters" element="tptz:GetPresetTours"/>
-	</wsdl:message>
-	<wsdl:message name="GetPresetToursResponse">
-		<wsdl:part name="parameters" element="tptz:GetPresetToursResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetPresetTourRequest">
-		<wsdl:part name="parameters" element="tptz:GetPresetTour"/>
-	</wsdl:message>
-	<wsdl:message name="GetPresetTourResponse">
-		<wsdl:part name="parameters" element="tptz:GetPresetTourResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetPresetTourOptionsRequest">
-		<wsdl:part name="parameters" element="tptz:GetPresetTourOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetPresetTourOptionsResponse">
-		<wsdl:part name="parameters" element="tptz:GetPresetTourOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="CreatePresetTourRequest">
-		<wsdl:part name="parameters" element="tptz:CreatePresetTour"/>
-	</wsdl:message>
-	<wsdl:message name="CreatePresetTourResponse">
-		<wsdl:part name="parameters" element="tptz:CreatePresetTourResponse"/>
-	</wsdl:message>
-	<wsdl:message name="ModifyPresetTourRequest">
-		<wsdl:part name="parameters" element="tptz:ModifyPresetTour"/>
-	</wsdl:message>
-	<wsdl:message name="ModifyPresetTourResponse">
-		<wsdl:part name="parameters" element="tptz:ModifyPresetTourResponse"/>
-	</wsdl:message>
-	<wsdl:message name="OperatePresetTourRequest">
-		<wsdl:part name="parameters" element="tptz:OperatePresetTour"/>
-	</wsdl:message>
-	<wsdl:message name="OperatePresetTourResponse">
-		<wsdl:part name="parameters" element="tptz:OperatePresetTourResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemovePresetTourRequest">
-		<wsdl:part name="parameters" element="tptz:RemovePresetTour"/>
-	</wsdl:message>
-	<wsdl:message name="RemovePresetTourResponse">
-		<wsdl:part name="parameters" element="tptz:RemovePresetTourResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleConfigurationsRequest">
-		<wsdl:part name="parameters" element="tptz:GetCompatibleConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleConfigurationsResponse">
-		<wsdl:part name="parameters" element="tptz:GetCompatibleConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="PTZ">
-		<wsdl:operation name="GetServiceCapabilities">
-			<wsdl:documentation>Returns the capabilities of the PTZ service. The result is returned in a typed answer.</wsdl:documentation>
-			<wsdl:input message="tptz:GetServiceCapabilitiesRequest"/>
-			<wsdl:output message="tptz:GetServiceCapabilitiesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetNodes">
-			<wsdl:documentation>
-				Get the descriptions of the available PTZ Nodes.
-				<br/>
-				A PTZ-capable device may have multiple PTZ Nodes. The PTZ Nodes may represent
-				mechanical PTZ drivers, uploaded PTZ drivers or digital PTZ drivers. PTZ Nodes are the
-				lowest level entities in the PTZ control API and reflect the supported PTZ capabilities. The
-				PTZ Node is referenced either by its name or by its reference token. 
-      		</wsdl:documentation>
-			<wsdl:input message="tptz:GetNodesRequest"/>
-			<wsdl:output message="tptz:GetNodesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetNode">
-			<wsdl:documentation>Get a specific PTZ Node identified by a reference
-        token or a name.
-	  </wsdl:documentation>
-			<wsdl:input message="tptz:GetNodeRequest"/>
-			<wsdl:output message="tptz:GetNodeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetConfiguration">
-			<wsdl:documentation>Get a specific PTZonfiguration from the device, identified by its reference token or name.
-				<br/>
-				The default Position/Translation/Velocity Spaces are introduced to allow NVCs sending move
-				requests without the need to specify a certain coordinate system. The default Speeds are
-				introduced to control the speed of move requests (absolute, relative, preset), where no
-				explicit speed has been set.<br/>
-				The allowed pan and tilt range for Pan/Tilt Limits is defined by a two-dimensional space range
-				that is mapped to a specific Absolute Pan/Tilt Position Space. At least one Pan/Tilt Position
-				Space is required by the PTZNode to support Pan/Tilt limits. The limits apply to all supported
-				absolute, relative and continuous Pan/Tilt movements. The limits shall be checked within the
-				coordinate system for which the limits have been specified. That means that even if
-				movements are specified in a different coordinate system, the requested movements shall be
-				transformed to the coordinate system of the limits where the limits can be checked. When a
-				relative or continuous movements is specified, which would leave the specified limits, the PTZ
-				unit has to move along the specified limits. The Zoom Limits have to be interpreted
-				accordingly.
-			</wsdl:documentation>
-			<wsdl:input message="tptz:GetConfigurationRequest"/>
-			<wsdl:output message="tptz:GetConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetConfigurations">
-			<wsdl:documentation>
-		        Get all the existing PTZConfigurations from the device.
-				<br/>
-				The default Position/Translation/Velocity Spaces are introduced to allow NVCs sending move
-				requests without the need to specify a certain coordinate system. The default Speeds are
-				introduced to control the speed of move requests (absolute, relative, preset), where no
-				explicit speed has been set.<br/>
-				The allowed pan and tilt range for Pan/Tilt Limits is defined by a two-dimensional space range
-				that is mapped to a specific Absolute Pan/Tilt Position Space. At least one Pan/Tilt Position
-				Space is required by the PTZNode to support Pan/Tilt limits. The limits apply to all supported
-				absolute, relative and continuous Pan/Tilt movements. The limits shall be checked within the
-				coordinate system for which the limits have been specified. That means that even if
-				movements are specified in a different coordinate system, the requested movements shall be
-				transformed to the coordinate system of the limits where the limits can be checked. When a
-				relative or continuous movements is specified, which would leave the specified limits, the PTZ
-				unit has to move along the specified limits. The Zoom Limits have to be interpreted
-				accordingly.
-			</wsdl:documentation>
-			<wsdl:input message="tptz:GetConfigurationsRequest"/>
-			<wsdl:output message="tptz:GetConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetConfiguration">
-			<wsdl:documentation>
-        Set/update a existing PTZConfiguration on the device.
-      </wsdl:documentation>
-			<wsdl:input message="tptz:SetConfigurationRequest"/>
-			<wsdl:output message="tptz:SetConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetConfigurationOptions">
-			<wsdl:documentation>
-				List supported coordinate systems including their range limitations. Therefore, the options
-				MAY differ depending on whether the PTZ Configuration is assigned to a Profile containing a
-				Video Source Configuration. In that case, the options may additionally contain coordinate
-				systems referring to the image coordinate system described by the Video Source
-				Configuration. If the PTZ Node supports continuous movements, it shall return a Timeout Range within
-				which Timeouts are accepted by the PTZ Node.				
-			</wsdl:documentation>
-			<wsdl:input message="tptz:GetConfigurationOptionsRequest"/>
-			<wsdl:output message="tptz:GetConfigurationOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SendAuxiliaryCommand">
-			<wsdl:documentation>
-        Operation to send auxiliary commands to the PTZ device
-        mapped by the PTZNode in the selected profile. The
-        operation is supported
-        if the AuxiliarySupported element of the PTZNode is true
-      </wsdl:documentation>
-			<wsdl:input message="tptz:SendAuxiliaryCommandRequest"/>
-			<wsdl:output message="tptz:SendAuxiliaryCommandResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetPresets">
-			<wsdl:documentation>
-        Operation to request all PTZ presets for the PTZNode
-        in the selected profile. The operation is supported if there is support
-        for at least on PTZ preset by the PTZNode.</wsdl:documentation>
-			<wsdl:input message="tptz:GetPresetsRequest"/>
-			<wsdl:output message="tptz:GetPresetsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetPreset">
-			<wsdl:documentation>
-				The SetPreset command saves the current device position parameters so that the device can
-				move to the saved preset position through the GotoPreset operation.
-				In order to create a new preset, the SetPresetRequest contains no PresetToken. If creation is
-				successful, the Response contains the PresetToken which uniquely identifies the Preset. An
-				existing Preset can be overwritten by specifying the PresetToken of the corresponding Preset.
-				In both cases (overwriting or creation) an optional PresetName can be specified. The
-				operation fails if the PTZ device is moving during the SetPreset operation.
-				The device MAY internally save additional states such as imaging properties in the PTZ
-				Preset which then should be recalled in the GotoPreset operation.      </wsdl:documentation>
-			<wsdl:input message="tptz:SetPresetRequest"/>
-			<wsdl:output message="tptz:SetPresetResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemovePreset">
-			<wsdl:documentation>
-        Operation to remove a PTZ preset for the Node in
-        the
-        selected profile. The operation is supported if the
-        PresetPosition
-        capability exists for teh Node in the
-        selected profile.
-      </wsdl:documentation>
-			<wsdl:input message="tptz:RemovePresetRequest"/>
-			<wsdl:output message="tptz:RemovePresetResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GotoPreset">
-			<wsdl:documentation>
-        Operation to go to a saved preset position for the
-        PTZNode in the selected profile. The operation is supported if there is
-        support for at least on PTZ preset by the PTZNode.</wsdl:documentation>
-			<wsdl:input message="tptz:GotoPresetRequest"/>
-			<wsdl:output message="tptz:GotoPresetResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GotoHomePosition">
-			<wsdl:documentation>
-        Operation to move the PTZ device to it's &quot;home&quot; position. The operation is supported if the HomeSupported element in the PTZNode is true.</wsdl:documentation>
-			<wsdl:input message="tptz:GotoHomePositionRequest"/>
-			<wsdl:output message="tptz:GotoHomePositionResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetHomePosition">
-			<wsdl:documentation>Operation to save current position as the home position.
-				The SetHomePosition command returns with a failure if the “home” position is fixed and
-				cannot be overwritten. If the SetHomePosition is successful, it is possible to recall the
-				Home Position with the GotoHomePosition command.</wsdl:documentation>
-			<wsdl:input message="tptz:SetHomePositionRequest"/>
-			<wsdl:output message="tptz:SetHomePositionResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="ContinuousMove">
-			<wsdl:documentation>Operation for continuous Pan/Tilt and Zoom movements. The operation is supported if the PTZNode supports at least one continuous Pan/Tilt or Zoom space. If the space argument is omitted, the default space set by the PTZConfiguration will be used.</wsdl:documentation>
-			<wsdl:input message="tptz:ContinuousMoveRequest"/>
-			<wsdl:output message="tptz:ContinuousMoveResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RelativeMove">
-			<wsdl:documentation>Operation for Relative Pan/Tilt and Zoom Move. The operation is supported if the PTZNode supports at least one relative Pan/Tilt or Zoom space.<br/> 
-				The speed argument is optional. If an x/y speed value is given it is up to the device to either use 
-				the x value as absolute resoluting speed vector or to map x and y to the component speed. 
-				If the speed argument is omitted, the default speed set by the PTZConfiguration will be used.
-			</wsdl:documentation>
-			<wsdl:input message="tptz:RelativeMoveRequest"/>
-			<wsdl:output message="tptz:RelativeMoveResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetStatus">
-			<wsdl:documentation>
-				Operation to request PTZ status for the Node in the
-				selected profile.</wsdl:documentation>
-			<wsdl:input message="tptz:GetStatusRequest"/>
-			<wsdl:output message="tptz:GetStatusResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AbsoluteMove">
-			<wsdl:documentation>Operation to move pan,tilt or zoom to a absolute destination. <br/>
-				The speed argument is optional. If an x/y speed value is given it is up to the device to either use 
-				the x value as absolute resoluting speed vector or to map x and y to the component speed. 
-				If the speed argument is omitted, the default speed set by the PTZConfiguration will be used.
-			</wsdl:documentation>
-			<wsdl:input message="tptz:AbsoluteMoveRequest"/>
-			<wsdl:output message="tptz:AbsoluteMoveResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="Stop">
-			<wsdl:documentation>Operation to stop ongoing pan, tilt and zoom movements of absolute relative and continuous type.
-If no stop argument for pan, tilt or zoom is set, the device will stop all ongoing pan, tilt and zoom movements.</wsdl:documentation>
-			<wsdl:input message="tptz:StopRequest"/>
-			<wsdl:output message="tptz:StopResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetPresetTours">
-			<wsdl:documentation>Operation to request PTZ preset tours in the selected media profiles.</wsdl:documentation>
-			<wsdl:input message="tptz:GetPresetToursRequest"/>
-			<wsdl:output message="tptz:GetPresetToursResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetPresetTour">
-			<wsdl:documentation>Operation to request a specific PTZ preset tour in the selected media profile.</wsdl:documentation>
-			<wsdl:input message="tptz:GetPresetTourRequest"/>
-			<wsdl:output message="tptz:GetPresetTourResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetPresetTourOptions">
-			<wsdl:documentation>Operation to request available options to configure PTZ preset tour.</wsdl:documentation>
-			<wsdl:input message="tptz:GetPresetTourOptionsRequest"/>
-			<wsdl:output message="tptz:GetPresetTourOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="CreatePresetTour">
-			<wsdl:documentation>Operation to create a preset tour for the selected media profile.</wsdl:documentation>
-			<wsdl:input message="tptz:CreatePresetTourRequest"/>
-			<wsdl:output message="tptz:CreatePresetTourResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="ModifyPresetTour">
-			<wsdl:documentation>Operation to modify a preset tour for the selected media profile.</wsdl:documentation>
-			<wsdl:input message="tptz:ModifyPresetTourRequest"/>
-			<wsdl:output message="tptz:ModifyPresetTourResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="OperatePresetTour">
-			<wsdl:documentation>Operation to perform specific operation on the preset tour in selected media profile.</wsdl:documentation>
-			<wsdl:input message="tptz:OperatePresetTourRequest"/>
-			<wsdl:output message="tptz:OperatePresetTourResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemovePresetTour">
-			<wsdl:documentation>Operation to delete a specific preset tour from the media profile.</wsdl:documentation>
-			<wsdl:input message="tptz:RemovePresetTourRequest"/>
-			<wsdl:output message="tptz:RemovePresetTourResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleConfigurations">
-			<wsdl:documentation>Operation to get all available PTZConfigurations that can be added to the referenced media profile. <br/>
-				A device providing more than one PTZConfiguration or more than one VideoSourceConfiguration or which has any other resource
-				interdependency between PTZConfiguration entities and other resources listable in a media profile should implement this operation.
-				PTZConfiguration entities returned by this operation shall not fail on adding them to the referenced media profile.
-			</wsdl:documentation>
-			<wsdl:input message="tptz:GetCompatibleConfigurationsRequest"/>
-			<wsdl:output message="tptz:GetCompatibleConfigurationsResponse"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="PTZBinding" type="tptz:PTZ">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsdl:operation name="GetServiceCapabilities">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetServiceCapabilities"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetConfigurations"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetPresets">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetPresets"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetPreset">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/SetPreset"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="RemovePreset">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/RemovePreset"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GotoPreset">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GotoPreset"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetStatus">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetStatus"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetNodes">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetNodes"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetNode">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetNode"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/SetConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetConfigurationOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetConfigurationOptions"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GotoHomePosition">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GotoHomePosition"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetHomePosition">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/SetHomePosition"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="ContinuousMove">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="RelativeMove">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/RelativeMove"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SendAuxiliaryCommand">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/SendAuxiliaryCommand"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="AbsoluteMove">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/AbsoluteMove"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="Stop">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/Stop"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetPresetTours">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetPresetTours"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetPresetTour">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetPresetTour"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetPresetTourOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetPresetTourOptions"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="CreatePresetTour">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/CreatePresetTour"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="ModifyPresetTour">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/ModifyPresetTour"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="OperatePresetTour">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/OperatePresetTour"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="RemovePresetTour">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/RemovePresetTour"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleConfigurations">
-			<soap:operation
-				soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetCompatibleConfigurations"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-</wsdl:definitions>
diff --git a/src/onvif_srvd/onvif_srvd/wsdl/t-1.xsd b/src/onvif_srvd/onvif_srvd/wsdl/t-1.xsd
deleted file mode 100644
index 6e93314..0000000
--- a/src/onvif_srvd/onvif_srvd/wsdl/t-1.xsd
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-
-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004-2006). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
--->
-
-
-<xsd:schema 
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-  xmlns:wstop = "http://docs.oasis-open.org/wsn/t-1"
-  targetNamespace = "http://docs.oasis-open.org/wsn/t-1"   
-  elementFormDefault="qualified"  attributeFormDefault="unqualified">
-
-<!-- =============== utility type definitions  ==================== -->
-  <xsd:complexType name="Documentation" mixed="true">
-    <xsd:sequence>
-      <xsd:any processContents="lax" minOccurs="0" 
-               maxOccurs="unbounded" namespace="##any"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ExtensibleDocumented" abstract="true" 
-                   mixed="false">
-    <xsd:sequence>
-      <xsd:element name="documentation" type="wstop:Documentation" 
-                   minOccurs="0" />
-    </xsd:sequence>
-    <xsd:anyAttribute namespace="##other" processContents="lax" />
-</xsd:complexType>
-
-<xsd:complexType name="QueryExpressionType" mixed="true">
-  <xsd:sequence>
-    <xsd:any minOccurs="0" maxOccurs="1" processContents="lax" />
-  </xsd:sequence>
-  <xsd:attribute name="Dialect" type="xsd:anyURI" use="required"/>
-</xsd:complexType>
-
-<!-- ================== Topic-Namespace Related  ================ -->   
-  <xsd:complexType name="TopicNamespaceType">
-    <xsd:complexContent>
-       <xsd:extension base="wstop:ExtensibleDocumented">
-         <xsd:sequence>
-           <xsd:element name="Topic" 
-                        minOccurs="0" maxOccurs="unbounded">
-              <xsd:complexType>
-              	<xsd:complexContent>
-              	  <xsd:extension base="wstop:TopicType">
-              	    <xsd:attribute name="parent" type="wstop:ConcreteTopicExpression" />
-              	  </xsd:extension>
-              	</xsd:complexContent>
-              </xsd:complexType>
-           </xsd:element>   
-           <xsd:any namespace="##other" 
-                    minOccurs="0" maxOccurs="unbounded" 
-                    processContents="lax"/>
-         </xsd:sequence>
-         <xsd:attribute name="name" type="xsd:NCName"/>
-         <xsd:attribute name="targetNamespace" type="xsd:anyURI" 
-                        use="required"/>
-         <xsd:attribute name="final" type="xsd:boolean" 
-                                     default="false"/>
-       </xsd:extension>
-     </xsd:complexContent> 
-   </xsd:complexType>
-
-  <xsd:element name="TopicNamespace" type="wstop:TopicNamespaceType">
-    <xsd:unique name="rootTopicUniqueness">
-      <xsd:selector xpath="wstop:Topic"/>
-        <xsd:field xpath="@name"/>
-    </xsd:unique>
-  </xsd:element>
-  
-  <xsd:attribute name="topicNamespaceLocation" type="xsd:anyURI"/>
-
-
-
-<!-- ===================== Topic Related  ========================= -->   
-
-  <xsd:complexType name="TopicType">
-    <xsd:complexContent>
-      <xsd:extension base="wstop:ExtensibleDocumented">
-        <xsd:sequence>
-          <xsd:element name="MessagePattern" 
-                       type="wstop:QueryExpressionType" 
-                       minOccurs="0" maxOccurs="1" />
-          <xsd:element name="Topic" type="wstop:TopicType" 
-                       minOccurs="0" maxOccurs="unbounded">
-            <xsd:unique name="childTopicUniqueness">
-              <xsd:selector xpath="wstop:topic"/>
-              <xsd:field xpath="@name"/>
-            </xsd:unique>
-          </xsd:element>
-          <xsd:any namespace="##other" minOccurs="0" 
-                                       maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="name" use="required" type="xsd:NCName"/>
-        <xsd:attribute name="messageTypes">
-          <xsd:simpleType>
-            <xsd:list itemType="xsd:QName"/>
-          </xsd:simpleType>
-        </xsd:attribute>
-        <xsd:attribute name="final" type="xsd:boolean" 
-                                     default="false"/>
-      </xsd:extension>
-    </xsd:complexContent>  
-  </xsd:complexType>
-
-<!-- ================ Topic Set Related  =================== -->   
-  
-  <xsd:complexType name="TopicSetType">
-    <xsd:complexContent>
-       <xsd:extension base="wstop:ExtensibleDocumented">
-         <xsd:sequence>
-           <xsd:any namespace="##other" 
-                    minOccurs="0" maxOccurs="unbounded" 
-                    processContents="lax"/>
-         </xsd:sequence>
-       </xsd:extension>
-     </xsd:complexContent> 
-   </xsd:complexType>
-
-  <xsd:element name="TopicSet" type="wstop:TopicSetType"/>
-<xsd:attribute name="topic" type="xsd:boolean" default="false"/>
-
-<!-- ================ Topic Expression Related  =================== -->   
-  
-  <xsd:simpleType name="FullTopicExpression">
-    <xsd:restriction base="xsd:token">
-      <xsd:annotation>
-        <xsd:documentation>
-        TopicPathExpression  ::=   TopicPath ( '|' TopicPath )*  
-        TopicPath       ::=   RootTopic ChildTopicExpression* 
-        RootTopic       ::=   NamespacePrefix? ('//')? (NCName | '*')  
-        NamespacePrefix ::=   NCName ':'      
-        ChildTopicExpression ::=   '/' '/'? (QName | NCName | '*'| '.')
-                        
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:pattern value= 
-         "([\i-[:]][\c-[:]]*:)?(//)?([\i-[:]][\c-[:]]*|\*)((/|//)(([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*|\*|[.]))*(\|([\i-[:]][\c-[:]]*:)?(//)?([\i-[:]][\c-[:]]*|\*)((/|//)(([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*|\*|[.]))*)*">
-      </xsd:pattern>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="ConcreteTopicExpression">
-    <xsd:restriction base="xsd:token">
-      <xsd:annotation>
-        <xsd:documentation>
-  The pattern allows strings matching the following EBNF:
-    ConcreteTopicPath    ::=   RootTopic ChildTopic*    
-    RootTopic            ::=   QName  
-    ChildTopic           ::=   '/' (QName | NCName) 
-                        
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:pattern value=
-"(([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*)(/([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*)*" >
-      </xsd:pattern>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="SimpleTopicExpression">
-    <xsd:restriction base="xsd:QName">
-      <xsd:annotation>
-        <xsd:documentation>
-  The pattern allows strings matching the following EBNF:
-    RootTopic            ::=   QName  
-                        
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/src/onvif_srvd/onvif_srvd/wsdl/typemap.dat b/src/onvif_srvd/onvif_srvd/wsdl/typemap.dat
deleted file mode 100644
index a3f7403..0000000
--- a/src/onvif_srvd/onvif_srvd/wsdl/typemap.dat
+++ /dev/null
@@ -1,539 +0,0 @@
-#	typemap.dat
-
-#	Use this file to define XML namespace prefixes and type bindings for
-#	interface header files generated by the wsdl2h tool.
-#
-#	This typemap.dat file is the default file used by wsdl2h to customize
-#	its output. You can use wsdl2h option -t to specify an alternate file.
-
-#######	XML NAMESPACE BINDINGS
-
-#	You can define XML namespace prefix bindings to override the default
-#	choice of the ns1, ns2, ... prefixes generated by wsdl2h.  It is highly
-#	recommended to provide namespace prefixes for your project's XML
-#	namespaces.  In this way, changes to the WSDL (or newer releases of
-#	wsdl2h) will have a minimal impact on coding and project maintenance.
-#
-#	Bindings for namespace prefixes are of the form:
-#
-#		prefix = "URI"
-#
-#	For example, to bind prefix s3 to the AWS S3 namespace:
-#
-#		s3 = "http://s3.amazonaws.com/doc/2006-03-01/"
-
-#######	XSD TYPE BINDINGS
-
-#	Type bindings can be provided to bind XML schema types to C/C++
-#	types for your project.
-#
-#	Type bindings are of the form:
-#
-#		prefix__type = declaration | use | ptr-use
-#
-#	where 'prefix__type' is the C/C++-translation of the schema type,
-#	'declaration' introduces the type in the header file, the optional
-#	'use' specifies how the type is used directly, and the optional
-#	'ptr-use' specifies how the type is used as a pointer type.
-#
-#	For example, to use wide strings in C:
-#
-#		xsd__string = | wchar_t* | wchar_t*
-#
-#	this replaces the default char* mapping in C for xsd:string.
-#	To use C++ std::wstring for xsd:string:
-#
-#		xsd__string = | std::wstring
-#
-#	After enabling one of these lines, all XSD strings will be changed in
-#	the interface file generated by wsdl2h.  Rerun wsdl2h if necessary.
-#	Note that the 'declaration' part above is empta,y as expected.
-#
-#	When a type binding requires only the usage to be changed and the
-#	declaration part must be kept intact, then the declaration part should
-#	be specified as an elipsis '...':
-#
-#		prefix__type = ... | use | ptr-use
-#
-#	This ensure that the wsdl2h-generated type definition is preserved,
-#	while the use and ptr-use are changed.
-#
-#	For example, this is useful to map schema polymorphic types to C types,
-#	where we need to be able to both handle a base type and its extensions
-#	as per schema extensibility. Say base type ns:base allows derived
-#	extensions and we need to map this to C types as follows:
-#
-#		ns__base = ... | int __type_base; void*
-#
-#	where __type_base and void* are used to (de)serialize any data type,
-#	including base and its derived types.
-
-#######	CLASS/STRUCT MEMBER ADDITIONS
-
-#	Additional data and function members can be provided to extend a
-#	wsdl2h-generated struct or class.
-#
-#	Class and struct extensions are of the form:
-#
-#		prefix__type = $ member-declaration
-#
-#	For example, to add a constructor and destructor to class myns__record:
-#
-#		myns__record = $ myns__record();
-#		myns__record = $ ~myns__record();
-
-#######	TYPE EQUIVALENCES
-
-#	Type equivalence mappings can be given to replace a type with another:
-#
-#		prefix__type1 == prefix__type2
-#
-#	This replaces 'prefix__type1' by 'prefix__type2' in the wsdl2h output.
-#
-#	For example:
-#
-#		SOAP_ENC__boolean == xsd__boolean
-#
-#	replaces 'SOAP_ENC__boolean' with the C/C++ type information that
-#	corresponds to `xsd__boolean' which is 'bool' for C++.
-#
-#	Target C/C++ type names (names without prefix) can also be replaced:
-#
-#		float == double
-#
-#	which replaces all 'float' with 'double' in the wsdl2h output. Beware
-#	that replacing types may lead to xsi:type mismatches and SOAP
-#	encoding id-ref mismatches when parsing inbound XML messages.
-
-#######	BUILT-IN VARIABLES
-
-#	The variable '$CONTAINER' defines the container to emit in the
-#	generated declarations, which is std::vector by default.
-#
-#	For example:
-#
-#		$CONTAINER = std::list
-#
-#	The variable '$POINTER' defines the smart pointer to emit in the
-#	generated declarations, replacing '*'. For example:
-#
-#		$POINTER = std::shared_ptr
-#
-#	Not all pointers in the generated output can be replaced by smart
-#	pointers when standard pointers are used as union members and pointers
-#	to arrays.
-
-#######	USER-DEFINED CONTENT
-
-#	Any other content to be included in the generated header file can be
-#	provided by enclosing it within brackets [ and ]. These brackets MUST
-#	appear at the start of a new line.
-#
-#	For example, to add an #import directive to the wsdl2h-generated output:
-#
-#       [
-#       #import "wsa5.h"
-#       ]
-
-#-------------------------------------------------------------------------------
-#gSOAP XML Web services tools
-#Copyright (C) 2000-2015, Robert van Engelen, Genivia Inc. All Rights Reserved.
-#This software is released under one of the following two licenses:
-#GPL or Genivia's license for commercial use.
-#-------------------------------------------------------------------------------
-#A commercial use license is available from Genivia, Inc., contact@genivia.com
-#-------------------------------------------------------------------------------
-
-[
-// Reminder: Modify typemap.dat to customize the header file generated by wsdl2h
-]
-
-#	Remember: type bindings are given on a single line (use \ to continue
-#	with the next line). Here is an example binding for the XSD int type
-#	that maps to an 'int':
-# xsd__int	= | int
-
-#	To use regular char* strings instead of std::string, use:
-# xsd__string	= | char* | char*
-
-#	For char* serialized with xsi:type when using soapcpp2 option -t, use:
-# xsd__string	= typedef char *xsd__string; | xsd__string | xsd__string
-
-#	The following mapping is internally applied by wsdl2h for C (not C++):
-#	(assuming option -e is used to remove the xsd__boolean__ name prefix)
-# xsd__boolean	= enum xsd__boolean { false_, true_ }; | enum xsd__boolean
-
-#	Uncomment the line below to use __int128_t for xsd:integer instead of
-#	mapping xsd:integer to string.
-#	Then rerun wsdl2h and also compile and link custom/int128.c
-# xsd__integer = #import "custom/int128.h" | xsd__integer
-#
-#	Or if the xsd:integer value range is bounded to int64_t, then:
-# xsd__integer = typedef LONG64 xsd__integer;
-#
-#	Also, to enable XSD integer types that are restrictions of xsd:integer
-#	to be mapped to int128 or LONG64, uncomment:
-# xsd__nonNegativeInteger = typedef xsd__integer xsd__nonNegativeInteger 0 :   ;
-# xsd__nonPositiveInteger = typedef xsd__integer xsd__nonPositiveInteger   : 0 ;
-# xsd__positiveInteger    = typedef xsd__integer xsd__positiveInteger    1 :   ;
-# xsd__negativeInteger    = typedef xsd__integer xsd__negativeInteger      : -1;
-
-#	Uncomment the line below to use long double for xsd:decimal instead of
-#	mapping xsd:decimal to string.
-#	Then rerun wsdl2h and also compile and link custom/long_double.c.
-# xsd__decimal = #import "custom/long_double.h" | long double
-#
-#	Or if your system supports __float128 then you can use:
-# xsd__decimal = #import "custom/float128.h" | xsd__decimal
-#
-#	Or if the xsd:decimal value range is bounded to double, then:
-# xsd__decimal = typedef double xsd__decimal;
-
-#	Uncomment the line below to use struct tm instead of time_t xsd:dateTime
-#	Then rerun wsdl2h and also compile and link custom/struct_tm.c.
-# xsd__dateTime = #import "custom/struct_tm.h" | xsd__dateTime
-
-#	Uncomment the line below to use timeval with usec precision xsd:dateTime
-#	Then rerun wsdl2h and also compile and link custom/struct_timeval.c.
-# xsd__dateTime = #import "custom/struct_timeval.h" | xsd__dateTime
-
-#	Uncomment the line below to use std::chrono::system_clock::time_point
-#	for xsd:dateTime.
-#	Then rerun wsdl2h and also compile and link custom/chrono_time_point.c.
-# xsd__dateTime = #import "custom/chrono_time_point.h" | xsd__dateTime
-
-#	Uncomment the line below to use struct tm for xsd:date instead of
-#	mapping xsd:date to string.
-#	Then rerun wsdl2h and also compile and link custom/struct_tm_date.c.
-# xsd__date = #import "custom/struct_tm_date.h" | xsd__date
-
-#	Uncomment the line below to use LONG64 int for xsd:duration instead of
-#	mapping xsd:duration to string (in milliseconds precision).
-#	Then rerun wsdl2h and also compile and link custom/duration.c.
-
-xsd__duration = #import "custom/duration.h" | xsd__duration
-
-#	Uncomment the line below to use C++11 std::chrono::nanoseconds for
-#	xsd:duration instead of mapping xsd:duration to string.
-#	Then rerun wsdl2h and also compile and link custom/chrono_duration.cpp.
-# xsd__duration = #import "custom/chrono_duration.h" | xsd__duration
-
-#	Uncomment the line below to use ULONG64 int for xsd:time instead of
-#	mapping xsd:time to string (also comes with high usec precision)
-#	Then rerun wsdl2h and also compile and link custom/time.c
-# xsd__time = #import "custom/long_time.h" | xsd__time
-
-#	When compiling WITH_LEAN there is no hexBinary serializer. You can
-#	remap the hexBinary type to a string as follows:
-# xsd__hexBinary = | char*
-
-#	When wsdl2h option -d is used, xsd:any is mapped to xsd__anyType DOM
-#	declared in dom.h and implemented in dom.c/dom.cpp. You can remap
-#	xsd:any, for example to a pointer to a DOM node as follows:
-# xsd__any = | xsd__anyType*
-
-#	When SOAP 1.2 Faults should carry multiple SOAP_ENV__Text elements with
-#	xml:lang attributes, then remap SOAP_ENV__Reason as follows:
-# [
-# struct SOAP_ENV__Reason
-# {
-#   char *SOAP_ENV__Text; // at least one SOAP-ENV:Text for the gSOAP engine
-#   $int size;
-#   struct SOAP_ENV__Text *SOAP_ENV__Text_; // array of more SOAP-ENV:Text
-# }; 
-# struct SOAP_ENV__Text
-# {
-#   char *__item;
-#   @char *xml__lang;
-# };
-# ]
-
-#	SOAP-ENV mapping (note: SOAP Body content is mapped to an XML string)
-
-SOAP_ENV__Envelope	= struct SOAP_ENV__Envelope { struct SOAP_ENV__Header *SOAP_ENV__Header; _XML SOAP_ENV__Body; }; | struct SOAP_ENV__Envelope
-SOAP_ENV__Header	= | struct SOAP_ENV__Header
-SOAP_ENV__Fault		= | struct SOAP_ENV__Fault
-SOAP_ENV__Detail	= | struct SOAP_ENV__Detail
-SOAP_ENV__Code		= | struct SOAP_ENV__Code
-SOAP_ENV__Subcode	= | struct SOAP_ENV__Subcode
-SOAP_ENV__Reason	= | struct SOAP_ENV__Reason
-
-#	Temporary URI
-
-tempuri	= "http://tempuri.org/"
-
-#	Empty URI
-
-empty	= ""
-
-#	.NET WCF DataContract Serialization Schema
-
-ser	= <http://schemas.microsoft.com/2003/10/Serialization/>
-arr	= "http://schemas.microsoft.com/2003/10/Serialization/Arrays"
-
-#	.NET WCF DataContract Serialization Schema remappings
-
-_ser__anyURI		== xsd__anyURI
-_ser__boolean		== xsd__boolean
-_ser__base64Binary	== xsd__base64Binary
-_ser__byte		== xsd__byte
-_ser__dateTime		== xsd__dateTime
-_ser__decimal		== xsd__decimal
-_ser__double		== xsd__double
-_ser__float		== xsd__float
-_ser__int		== xsd__int
-_ser__long		== xsd__long
-_ser__QName		== xsd__QName
-_ser__short		== xsd__short
-_ser__string		== xsd__string
-_ser__unsignedByte	== xsd__unsignedByte
-_ser__unsignedInt	== xsd__unsignedInt
-_ser__unsignedLong	== xsd__unsignedLong
-_ser__unsignedShort	== xsd__unsignedShort
-
-#	.NET WCF ser:anyType represents an object (see import/ser.h):
-
-_ser__anyType	= | struct __ser__anyType | struct __ser__anyType
-
-#	.NET WCF ser:char element and type represents a Unicode character
-
-_ser__char	= | int
-ser__char	= | int
-
-#	.NET WCF ser:duration element and type maps to xsd:duration
-
-_ser__duration	== xsd__duration
-ser__duration	== xsd__duration
-
-#	.NET WCF ser:guid pattern = "[\da-fA-F]{8}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{12}"
-
-_ser__guid	= | char*
-ser__guid	= | char*
-
-#	.NET WCF samples
-
-mssamh	= "http://Microsoft.Samples.Http"
-mssamhi	= "http://Microsoft.Samples.Http/Imports"
-
-mssamt	= "http://Microsoft.Samples.TransportSecurity"
-mssamti	= "http://Microsoft.Samples.TransportSecurity/Imports"
-
-mssamm	= "http://Microsoft.Samples.MessageSecurity"
-mssammi	= "http://Microsoft.Samples.MessageSecurity/Imports"
-
-mssadh  = "http://Microsoft.Samples.DualHttp"
-mssadhi = "http://Microsoft.Samples.DualHttp/Imports"
-
-#	MTOM xop and xmime are imported from xop.h, xmime.h, and xmlmime.h:
-#	Note: changed xmlmime to xmime to avoid other MTOM tools from
-#	complaining that 'xml' is reserved.
-
-xop	= <http://www.w3.org/2004/08/xop/include>
-xmime	= <http://www.w3.org/2004/06/xmlmime>
-xmime4	= <http://www.w3.org/2004/11/xmlmime>
-xmime5  = <http://www.w3.org/2005/05/xmlmime>
-
-#	xop:Include is imported from xop.h and redefined as _xop__Include:
-
-xop__Include = #import "xop.h" | _xop__Include
-
-#	xmime/xmlmime:contentType attribute is a string:
-
-_xmime__contentType	= | char* | char*
-_xmime4__contentType	= | char* | char*
-_xmime5__contentType	= | char* | char*
-
-#	exc-c14n
-
-c14n	= <http://www.w3.org/2001/10/xml-exc-c14n#>
-
-#	WS-Addressing (2003, 2004, and 2005 schemas)
-#	See import/wsa.h, import/wsa3.h etc for definitions and code examples
-#	The API is defined in plugin/wsaapi.c, plugin/wsaapi3.c, etc.
-
-wsa	= <http://schemas.xmlsoap.org/ws/2004/08/addressing>
-wsa3	= <http://schemas.xmlsoap.org/ws/2003/03/addressing>
-wsa4	= <http://schemas.xmlsoap.org/ws/2004/03/addressing>
-wsa5	= <http://www.w3.org/2005/08/addressing>
-
-#	The types below should not use pointers, so we add a 3rd column:
-
-_wsa__Action    = | | _wsa__Action
-_wsa__MessageID = | | _wsa__MessageID
-_wsa__To        = | | _wsa__To
-
-_wsa3__Action    = | | _wsa3__Action
-_wsa3__MessageID = | | _wsa3__MessageID
-_wsa3__To        = | | _wsa3__To
-
-_wsa4__Action    = | | _wsa4__Action
-_wsa4__MessageID = | | _wsa4__MessageID
-_wsa4__To        = | | _wsa4__To
-
-_wsa5__Action    = | | _wsa5__Action
-_wsa5__MessageID = | | _wsa5__MessageID
-_wsa5__To        = | | _wsa5__To
-
-#	WS-ReliableMessaging 1.1 and 1.0 (and obsolete WS-Reliability 2004)
-
-wsrm	= <http://docs.oasis-open.org/ws-rx/wsrm/200702>
-wsrm5	= <http://schemas.xmlsoap.org/ws/2005/02/rm>
-wsrm4	= <http://docs.oasis-open.org/wsrm/2004/06/ws-reliability-1.1.xsd>
-
-#	WS-Discovery 1.1 (2009/01) and 1.0 (2004/08 with WS-Addressing)
-#	To upgrade WS-Discovery to WS-Addressing 2005/08, uncomment wsdd5:
-
-wsdd	= <http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01>
-#wsdd5	= <http://schemas.xmlsoap.org/ws/2005/04/discovery>
-wsdd10	= <http://schemas.xmlsoap.org/ws/2005/04/discovery>
-
-wsdd5__HelloType		= | wsdd__HelloType
-wsdd5__ByeType			= | wsdd__ByeType
-wsdd5__ProbeType		= | wsdd__ProbeType
-wsdd5__ProbeMatchesType		= | wsdd__ProbeMatchesType
-wsdd5__ProbeMatchType		= | wsdd__ProbeMatchType
-wsdd5__ResolveType		= | wsdd__ResolveType
-wsdd5__ResolveMatchesType	= | wsdd__ResolveMatchesType
-wsdd5__ResolveMatchType		= | wsdd__ResolveMatchType
-wsdd5__ScopesType		= | wsdd__ScopesType
-wsdd5__SecurityType		= | wsdd__SecurityType
-wsdd5__SigType			= | wsdd__SigType
-wsdd5__AppSequenceType		= | wsdd__AppSequenceType
-
-wsdd10__HelloType		= | wsdd__HelloType
-wsdd10__ByeType			= | wsdd__ByeType
-wsdd10__ProbeType		= | wsdd__ProbeType
-wsdd10__ProbeMatchesType	= | wsdd__ProbeMatchesType
-wsdd10__ProbeMatchType		= | wsdd__ProbeMatchType
-wsdd10__ResolveType		= | wsdd__ResolveType
-wsdd10__ResolveMatchesType	= | wsdd__ResolveMatchesType
-wsdd10__ResolveMatchType	= | wsdd__ResolveMatchType
-wsdd10__ScopesType		= | wsdd__ScopesType
-wsdd10__SecurityType		= | wsdd__SecurityType
-wsdd10__SigType			= | wsdd__SigType
-wsdd10__AppSequenceType		= | wsdd__AppSequenceType
-
-#	WS-Policy
-
-wsp	= <http://schemas.xmlsoap.org/ws/2004/09/policy>
-
-#	WS-SecureConversation 1.4
-
-wsc	= <http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512>
-wsc2	= <http://schemas.xmlsoap.org/ws/2005/02/sc>
-
-#	WS-Trust 1.2 and 1.3
-
-wst	= <http://docs.oasis-open.org/ws-sx/ws-trust/200512/>
-wst12	= <http://schemas.xmlsoap.org/ws/2005/02/trust>
-
-#       SAML bindings
-
-saml1   = <urn:oasis:names:tc:SAML:1.0:assertion>
-saml2   = <urn:oasis:names:tc:SAML:2.0:assertion>
-
-#	WS-Security wsse 2004 v1.0 and 1.1 and old wsse 2002 schema
-
-wsse11	= <http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd>
-wsse	= <http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd>
-wsse2	= <http://schemas.xmlsoap.org/ws/2002/12/secext>
-
-_wsse2__Security == _wsse__Security
-wsse2__Security == wsse__Security
-
-#	wsu 2004
-
-wsu	= <http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd>
-
-_wsu__Id		= | char*
-_wsu__Created		= | time_t
-_wsu__Expires		= | time_t
-
-wsu__AttributedDateTime	= | time_t
-wsu__AttributedURI	= | char*
-
-#	Bindings for ds and xenc for WS-Security protocols:
-
-ds	= <http://www.w3.org/2000/09/xmldsig#>
-xenc	= <http://www.w3.org/2001/04/xmlenc#>
-
-#	xlink
-
-xlink	= "http://www.w3.org/1999/xlink"
-
-#	wsrp routing protocol (deprecated)
-
-wsrp	= <http://schemas.xmlsoap.org/rp/>
-
-#	BPEL 2.0
-
-bpel	= "http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-bpelabs = "http://docs.oasis-open.org/wsbpel/2.0/process/abstract"
-plnk	= "http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-sref	= "http://docs.oasis-open.org/wsbpel/2.0/serviceref"
-vprop	= "http://docs.oasis-open.org/wsbpel/2.0/varprop"
-
-#	ONVIF recommended prefixes as per 8/20/12
-#	http://www.onvif.org/onvif/ver10/device/wsdl/devicemgmt.wsdl
-#	http://www.onvif.org/onvif/ver10/event/wsdl/event.wsdl
-#	http://www.onvif.org/onvif/ver10/display.wsdl
-#	http://www.onvif.org/onvif/ver10/deviceio.wsdl
-#	http://www.onvif.org/onvif/ver20/imaging/wsdl/imaging.wsdl
-#	http://www.onvif.org/onvif/ver10/media/wsdl/media.wsdl
-#	http://www.onvif.org/onvif/ver20/ptz/wsdl/ptz.wsdl
-#	http://www.onvif.org/onvif/ver10/receiver.wsdl
-#	http://www.onvif.org/onvif/ver10/recording.wsdl
-#	http://www.onvif.org/onvif/ver10/search.wsdl
-#	http://www.onvif.org/onvif/ver10/network/wsdl/remotediscovery.wsdl
-#	http://www.onvif.org/onvif/ver10/replay.wsdl
-#	http://www.onvif.org/onvif/ver20/analytics/wsdl/analytics.wsdl
-#	http://www.onvif.org/onvif/ver10/analyticsdevice.wsdl	
-#	http://www.onvif.org/onvif/ver10/schema/onvif.xsd
-
-tds	= <http://www.onvif.org/ver10/device/wsdl>
-tev	= <http://www.onvif.org/ver10/events/wsdl>
-tls	= <http://www.onvif.org/ver10/display/wsdl>
-tmd	= <http://www.onvif.org/ver10/deviceIO/wsdl>
-timg	= <http://www.onvif.org/ver20/imaging/wsdl>
-trt	= <http://www.onvif.org/ver10/media/wsdl>
-tptz	= <http://www.onvif.org/ver20/ptz/wsdl>
-trv	= <http://www.onvif.org/ver10/receiver/wsdl>
-trc	= <http://www.onvif.org/ver10/recording/wsdl>
-tse	= <http://www.onvif.org/ver10/search/wsdl>
-trp	= <http://www.onvif.org/ver10/replay/wsdl>
-tan	= <http://www.onvif.org/ver20/analytics/wsdl>
-tad	= <http://www.onvif.org/ver10/analyticsdevice/wsdl>
-tdn	= <http://www.onvif.org/ver10/network/wsdl>
-tt	= <http://www.onvif.org/ver10/schema>
-
-#	OASIS recommended prefixes
-
-wsnt	= <http://docs.oasis-open.org/wsn/b-2>
-wsntw	= <http://docs.oasis-open.org/wsn/bw-2>
-wsrfbf	= <http://docs.oasis-open.org/wsrf/bf-2>
-wsrfr	= <http://docs.oasis-open.org/wsrf/r-2>
-wsrfrw  = <http://docs.oasis-open.org/wsrf/rw-2>
-wstop	= <http://docs.oasis-open.org/wsn/t-1>
-
-#	Prefix bindings for WhiteMesa interoperability testing round 2:
-
-i	= "http://soapinterop.org/"
-s	= "http://soapinterop.org/xsd"
-
-#	Prefix bindings for Amazon AWS S3 Web Services:
-
-aws	= "urn:PI/DevCentral/SoapService"
-s3	= "http://s3.amazonaws.com/doc/2006-03-01/"
-
-_s3__CreateBucketResponse = $ s3__CreateBucketResult* CreateBucketResponse;
-_s3__CopyObjectResponse   = $ s3__CopyObjectResult* CopyObjectResponse;
-
-#	Prefix binding for Mappoint Web services:
-
-mpt	= "http://s.mappoint.net/mappoint-30/"
-
-#	Prefix binding for XLIFF 2.0
-
-xliff = "urn:oasis:names:tc:xliff:document:2.0"
-
-xliff__priorityValue = typedef int xliff__priorityValue 1:10;
diff --git a/src/static/static/home/yi-hack-v5/etc/system.conf b/src/static/static/home/yi-hack-v5/etc/system.conf
index aa88ff6..51ae768 100644
--- a/src/static/static/home/yi-hack-v5/etc/system.conf
+++ b/src/static/static/home/yi-hack-v5/etc/system.conf
@@ -19,8 +19,7 @@ NTP_SERVER=pool.ntp.org
 PROXYCHAINSNG=no
 SWAP_FILE=no
 RTSP_PORT=554
-ONVIF_PORT=80
-HTTPD_PORT=8080
+HTTPD_PORT=80
 USERNAME=
 PASSWORD=
 TIMEZONE=
diff --git a/src/static/static/home/yi-hack-v5/script/check_conf.sh b/src/static/static/home/yi-hack-v5/script/check_conf.sh
index 834e56a..f9c402c 100755
--- a/src/static/static/home/yi-hack-v5/script/check_conf.sh
+++ b/src/static/static/home/yi-hack-v5/script/check_conf.sh
@@ -36,8 +36,7 @@ NTP_SERVER=pool.ntp.org
 PROXYCHAINSNG=no
 SWAP_FILE=yes
 RTSP_PORT=554
-ONVIF_PORT=80
-HTTPD_PORT=8080
+HTTPD_PORT=80
 USERNAME=
 PASSWORD=
 TIMEZONE=
diff --git a/src/static/static/home/yi-hack-v5/script/system.sh b/src/static/static/home/yi-hack-v5/script/system.sh
index 84ad7ab..232f6a2 100755
--- a/src/static/static/home/yi-hack-v5/script/system.sh
+++ b/src/static/static/home/yi-hack-v5/script/system.sh
@@ -109,8 +109,11 @@ fi
 if [[ x$(get_config USERNAME) != "x" ]] ; then
     USERNAME=$(get_config USERNAME)
     PASSWORD=$(get_config PASSWORD)
-    ONVIF_USERPWD="--user $USERNAME --password $PASSWORD"
-    echo "/:$USERNAME:$PASSWORD" > /tmp/httpd.conf
+    RTSP_USERPWD=$USERNAME:$PASSWORD@
+    ONVIF_USERPWD="user=$USERNAME\npassword=$PASSWORD"
+    echo "/onvif::" > /tmp/httpd.conf
+    echo "/:$USERNAME:$PASSWORD" >> /tmp/httpd.conf
+    chmod 0600 /tmp/httpd.conf
 fi
 
 if [[ x$(get_config SSH_PASSWORD) != "x" ]] ; then
@@ -130,12 +133,8 @@ case $(get_config RTSP_PORT) in
     ''|*[!0-9]*) RTSP_PORT=554 ;;
     *) RTSP_PORT=$(get_config RTSP_PORT) ;;
 esac
-case $(get_config ONVIF_PORT) in
-    ''|*[!0-9]*) ONVIF_PORT=80 ;;
-    *) ONVIF_PORT=$(get_config ONVIF_PORT) ;;
-esac
 case $(get_config HTTPD_PORT) in
-    ''|*[!0-9]*) HTTPD_PORT=8080 ;;
+    ''|*[!0-9]*) HTTPD_PORT=80 ;;
     *) HTTPD_PORT=$(get_config HTTPD_PORT) ;;
 esac
 
@@ -241,10 +240,6 @@ if [[ $HTTPD_PORT != "80" ]] ; then
     D_HTTPD_PORT=:$HTTPD_PORT
 fi
 
-if [[ $ONVIF_PORT != "80" ]] ; then
-    D_ONVIF_PORT=:$ONVIF_PORT
-fi
-
 if [[ $(get_config ONVIF_WM_SNAPSHOT) == "yes" ]] ; then
     WATERMARK="&watermark=yes"
 fi
@@ -273,20 +268,20 @@ if [[ $(get_config RTSP) == "yes" ]] ; then
     fi
     if [[ $(get_config RTSP_STREAM) == "low" ]]; then
         h264grabber -r low -m $MODEL_SUFFIX -f &
-        ONVIF_PROFILE_1="--name Profile_1 --width 640 --height 360 --url rtsp://%s$D_RTSP_PORT/ch0_1.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=low$WATERMARK --type H264"
+        ONVIF_PROFILE_1="name=Profile_1\nwidth=640\nheight=360\nurl=rtsp://$RTSP_USERPWD%s$D_RTSP_PORT/ch0_1.h264\nsnapurl=http://$RTSP_USERPWD%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=low$WATERMARK\ntype=H264"
     fi
     if [[ $(get_config RTSP_STREAM) == "high" ]]; then
         h264grabber -r high -m $MODEL_SUFFIX -f &
-        ONVIF_PROFILE_0="--name Profile_0 --width $HIGHWIDTH --height $HIGHHEIGHT --url rtsp://%s$D_RTSP_PORT/ch0_0.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=high$WATERMARK --type H264"
+        ONVIF_PROFILE_0="name=Profile_0\nwidth=$HIGHWIDTH\nheight=$HIGHHEIGHT\nurl=rtsp://$RTSP_USERPWD%s$D_RTSP_PORT/ch0_0.h264\nsnapurl=http://$RTSP_USERPWD%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=high$WATERMARK\ntype=H264"
     fi
     if [[ $(get_config RTSP_STREAM) == "both" ]]; then
          h264grabber -r low -m $MODEL_SUFFIX -f &
          h264grabber -r high -m $MODEL_SUFFIX -f &
         if [[ $(get_config ONVIF_PROFILE) == "low" ]] || [[ $(get_config ONVIF_PROFILE) == "both" ]] ; then
-            ONVIF_PROFILE_1="--name Profile_1 --width 640 --height 360 --url rtsp://%s$D_RTSP_PORT/ch0_1.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=low$WATERMARK --type H264"
+            ONVIF_PROFILE_1="name=Profile_1\nwidth=640\nheight=360\nurl=rtsp://$RTSP_USERPWD%s$D_RTSP_PORT/ch0_1.h264\nsnapurl=http://$RTSP_USERPWD%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=low$WATERMARK\ntype=H264"
         fi
         if [[ $(get_config ONVIF_PROFILE) == "high" ]] || [[ $(get_config ONVIF_PROFILE) == "both" ]] ; then
-            ONVIF_PROFILE_0="--name Profile_0 --width $HIGHWIDTH --height $HIGHHEIGHT --url rtsp://%s$D_RTSP_PORT/ch0_0.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=high$WATERMARK --type H264"
+            ONVIF_PROFILE_0="name=Profile_0\nwidth=$HIGHWIDTH\nheight=$HIGHHEIGHT\nurl=rtsp://$RTSP_USERPWD%s$D_RTSP_PORT/ch0_0.h264\nsnapurl=http://$RTSP_USERPWD%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=high$WATERMARK\ntype=H264"
         fi
     rRTSPServer -r $RRTSP_RES -a $RRTSP_AUDIO -p $RRTSP_PORT -u $RRTSP_USER -w $RRTSP_PWD &
     fi
@@ -310,13 +305,91 @@ if [[ $(get_config ONVIF) == "yes" ]] ; then
         ONVIF_NETIF="eth0"
     fi
 
+    ONVIF_SRVD_CONF="/tmp/onvif_simple_server.conf"
+
+    echo "model=Yi Hack" > $ONVIF_SRVD_CONF
+    echo "manufacturer=Yi" >> $ONVIF_SRVD_CONF
+    echo "firmware_ver=$YI_HACK_VER" >> $ONVIF_SRVD_CONF
+    echo "hardware_id=$HW_ID" >> $ONVIF_SRVD_CONF
+    echo "serial_num=$SERIAL_NUMBER" >> $ONVIF_SRVD_CONF
+    echo "ifs=$ONVIF_NETIF" >> $ONVIF_SRVD_CONF
+    echo "port=$HTTPD_PORT" >> $ONVIF_SRVD_CONF
+    echo "scope=onvif://www.onvif.org/Profile/Streaming" >> $ONVIF_SRVD_CONF
+    echo "" >> $ONVIF_SRVD_CONF
+    if [ ! -z $ONVIF_USERPWD ]; then
+        echo -e $ONVIF_USERPWD >> $ONVIF_SRVD_CONF
+        echo "" >> $ONVIF_SRVD_CONF
+    fi
+    if [ ! -z $ONVIF_PROFILE_0 ]; then
+        echo "#Profile 0" >> $ONVIF_SRVD_CONF
+        echo -e $ONVIF_PROFILE_0 >> $ONVIF_SRVD_CONF
+        echo "" >> $ONVIF_SRVD_CONF
+    fi
+    if [ ! -z $ONVIF_PROFILE_1 ]; then
+        echo "#Profile 1" >> $ONVIF_SRVD_CONF
+        echo -e $ONVIF_PROFILE_1 >> $ONVIF_SRVD_CONF
+        echo "" >> $ONVIF_SRVD_CONF
+    fi
+
     if [[ $MODEL_SUFFIX == "yi_dome" ]] || [[ $MODEL_SUFFIX == "yi_dome_1080p" ]] || [[ $MODEL_SUFFIX == "yi_cloud_dome_1080p" ]] ; then
-        onvif_srvd --pid_file /var/run/onvif_srvd.pid --model "$MODEL_SUFFIX" --manufacturer "Yi" --firmware_ver "$YI_HACK_VER" --hardware_id $HW_ID --serial_num $SERIAL_NUMBER --ifs $ONVIF_NETIF --port $ONVIF_PORT --scope onvif://www.onvif.org/Profile/S $ONVIF_PROFILE_0 $ONVIF_PROFILE_1 $ONVIF_USERPWD --ptz --move_left "/tmp/sd/yi-hack-v5/bin/ipc_cmd -m left" --move_right "/tmp/sd/yi-hack-v5/bin/ipc_cmd -m right" --move_up "/tmp/sd/yi-hack-v5/bin/ipc_cmd -m up" --move_down "/tmp/sd/yi-hack-v5/bin/ipc_cmd -m down" --move_stop "/tmp/sd/yi-hack-v5/bin/ipc_cmd -m stop" --move_preset "/tmp/sd/yi-hack-v5/bin/ipc_cmd -p %t"
-    else
-        onvif_srvd --pid_file /var/run/onvif_srvd.pid --model "$MODEL_SUFFIX" --manufacturer "Yi" --firmware_ver "$YI_HACK_VER" --hardware_id $HW_ID --serial_num $SERIAL_NUMBER --ifs $ONVIF_NETIF --port $ONVIF_PORT --scope onvif://www.onvif.org/Profile/S $ONVIF_PROFILE_0 $ONVIF_PROFILE_1 $ONVIF_USERPWD
+        echo "#PTZ" >> $ONVIF_SRVD_CONF
+        echo "ptz=1" >> $ONVIF_SRVD_CONF
+        echo "get_position=/tmp/sd/yi-hack-v5/bin/ipc_cmd -g" >> $ONVIF_SRVD_CONF
+        echo "move_left=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m left" >> $ONVIF_SRVD_CONF
+        echo "move_right=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m right" >> $ONVIF_SRVD_CONF
+        echo "move_up=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m up" >> $ONVIF_SRVD_CONF
+        echo "move_down=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m down" >> $ONVIF_SRVD_CONF
+        echo "move_stop=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m stop" >> $ONVIF_SRVD_CONF
+        echo "move_preset=/tmp/sd/yi-hack-v5/bin/ipc_cmd -p %d" >> $ONVIF_SRVD_CONF
+        echo "set_preset=/tmp/sd/yi-hack-v5/script/ptz_presets.sh -a add_preset -m %s" >> $ONVIF_SRVD_CONF
+        echo "set_home_position=/tmp/sd/yi-hack-v5/script/ptz_presets.sh -a set_home_position" >> $ONVIF_SRVD_CONF
+        echo "remove_preset=/tmp/sd/yi-hack-v5/script/ptz_presets.sh -a del_preset -n %d" >> $ONVIF_SRVD_CONF
+        echo "jump_to_abs=/tmp/sd/yi-hack-v5/bin/ipc_cmd -j %f,%f" >> $ONVIF_SRVD_CONF
+        echo "jump_to_rel=/tmp/sd/yi-hack-v5/bin/ipc_cmd -J %f,%f" >> $ONVIF_SRVD_CONF
+        echo "get_presets=/tmp/sd/yi-hack-v5/script/ptz_presets.sh -a get_presets" >> $ONVIF_SRVD_CONF
+        echo "" >> $ONVIF_SRVD_CONF
     fi
+
+    echo "#EVENT" >> $ONVIF_SRVD_CONF
+    echo "events=3" >> $ONVIF_SRVD_CONF
+    echo "#Event 0" >> $ONVIF_SRVD_CONF
+    echo "topic=tns1:VideoSource/MotionAlarm" >> $ONVIF_SRVD_CONF
+    echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+    echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+    echo "input_file=/tmp/onvif_notify_server/motion_alarm" >> $ONVIF_SRVD_CONF
+    echo "#Event 1" >> $ONVIF_SRVD_CONF
+    echo "topic=tns1:RuleEngine/MyRuleDetector/PeopleDetect" >> $ONVIF_SRVD_CONF
+    echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+    echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+    echo "input_file=/tmp/onvif_notify_server/human_detection" >> $ONVIF_SRVD_CONF
+    echo "#Event 2" >> $ONVIF_SRVD_CONF
+    echo "topic=tns1:RuleEngine/MyRuleDetector/VehicleDetect" >> $ONVIF_SRVD_CONF
+    echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+    echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+    echo "input_file=/tmp/onvif_notify_server/vehicle_detection" >> $ONVIF_SRVD_CONF
+    echo "#Event 3" >> $ONVIF_SRVD_CONF
+    echo "topic=tns1:RuleEngine/MyRuleDetector/DogCatDetect" >> $ONVIF_SRVD_CONF
+    echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+    echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+    echo "input_file=/tmp/onvif_notify_server/animal_detection" >> $ONVIF_SRVD_CONF
+    echo "#Event 4" >> $ONVIF_SRVD_CONF
+    echo "topic=tns1:RuleEngine/MyRuleDetector/BabyCryingDetect" >> $ONVIF_SRVD_CONF
+    echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+    echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+    echo "input_file=/tmp/onvif_notify_server/baby_crying" >> $ONVIF_SRVD_CONF
+    echo "#Event 5" >> $ONVIF_SRVD_CONF
+    echo "topic=tns1:AudioAnalytics/Audio/DetectedSound" >> $ONVIF_SRVD_CONF
+    echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+    echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+    echo "input_file=/tmp/onvif_notify_server/sound_detection" >> $ONVIF_SRVD_CONF
+
+    chmod 0600 $ONVIF_SRVD_CONF
+    onvif_simple_server --conf_file $ONVIF_SRVD_CONF
+    ipc2file
+    onvif_notify_server --conf_file $ONVIF_SRVD_CONF
+
     if [[ $(get_config ONVIF_WSDD) == "yes" ]] ; then
-        wsdd --pid_file /var/run/wsdd.pid --if_name $ONVIF_NETIF --type tdn:NetworkVideoTransmitter --xaddr http://%s$D_ONVIF_PORT --scope "onvif://www.onvif.org/name/Unknown onvif://www.onvif.org/Profile/Streaming"
+        wsd_simple_server --pid_file /var/run/wsd_simple_server.pid --if_name $ONVIF_NETIF --xaddr "http://%s$D_HTTPD_PORT/onvif/device_service" -m yi_hack -n Yi
     fi
 fi
 
diff --git a/src/www/httpd/cgi-bin/links.sh b/src/www/httpd/cgi-bin/links.sh
index c4bcccc..8071e12 100755
--- a/src/www/httpd/cgi-bin/links.sh
+++ b/src/www/httpd/cgi-bin/links.sh
@@ -26,7 +26,7 @@ case $(get_config RTSP_PORT) in
     *) RTSP_PORT=$(get_config RTSP_PORT) ;;
 esac
 case $(get_config HTTPD_PORT) in
-    ''|*[!0-9]*) HTTPD_PORT=8080 ;;
+    ''|*[!0-9]*) HTTPD_PORT=80 ;;
     *) HTTPD_PORT=$(get_config HTTPD_PORT) ;;
 esac
 
diff --git a/src/www/httpd/cgi-bin/service.sh b/src/www/httpd/cgi-bin/service.sh
index 6db82e0..fc10ff0 100755
--- a/src/www/httpd/cgi-bin/service.sh
+++ b/src/www/httpd/cgi-bin/service.sh
@@ -23,19 +23,16 @@ init_config()
     if [[ x$(get_config USERNAME) != "x" ]] ; then
         USERNAME=$(get_config USERNAME)
         PASSWORD=$(get_config PASSWORD)
-        ONVIF_USERPWD="--user $USERNAME --password $PASSWORD"
+        ONVIF_USERPWD="user=$USERNAME\npassword=$PASSWORD"
+        RTSP_USERPWD=$USERNAME:$PASSWORD@
     fi
 
     case $(get_config RTSP_PORT) in
         ''|*[!0-9]*) RTSP_PORT=554 ;;
         *) RTSP_PORT=$(get_config RTSP_PORT) ;;
     esac
-    case $(get_config ONVIF_PORT) in
-        ''|*[!0-9]*) ONVIF_PORT=80 ;;
-        *) ONVIF_PORT=$(get_config ONVIF_PORT) ;;
-    esac
     case $(get_config HTTPD_PORT) in
-        ''|*[!0-9]*) HTTPD_PORT=8080 ;;
+        ''|*[!0-9]*) HTTPD_PORT=80 ;;
         *) HTTPD_PORT=$(get_config HTTPD_PORT) ;;
     esac
 
@@ -43,10 +40,6 @@ init_config()
         D_RTSP_PORT=:$RTSP_PORT
     fi
 
-    if [[ $ONVIF_PORT != "80" ]] ; then
-        D_ONVIF_PORT=:$ONVIF_PORT
-    fi
-
     if [[ $HTTPD_PORT != "80" ]] ; then
         D_HTTPD_PORT=:$HTTPD_PORT
     fi
@@ -102,36 +95,115 @@ start_onvif()
         WATERMARK="&watermark=yes"
     fi
     if [[ $1 == "high" ]]; then
-        ONVIF_PROFILE_0="--name Profile_0 --width $HIGHWIDTH --height $HIGHHEIGHT --url rtsp://%s$D_RTSP_PORT/ch0_0.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=high$WATERMARK --type H264"
+        ONVIF_PROFILE_0="name=Profile_0\nwidth=$HIGHWIDTH\nheight=$HIGHHEIGHT\nurl=rtsp://$RTSP_USERPWD%s$D_RTSP_PORT/ch0_0.h264\nsnapurl=http://$RTSP_USERPWD%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=high$WATERMARK\ntype=H264"
     fi
     if [[ $1 == "low" ]]; then
-        ONVIF_PROFILE_1="--name Profile_1 --width 640 --height 360 --url rtsp://%s$D_RTSP_PORT/ch0_1.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=low$WATERMARK --type H264"
+        ONVIF_PROFILE_1="name=Profile_1\nwidth=640\nheight=360\nurl=rtsp://$RTSP_USERPWD%s$D_RTSP_PORT/ch0_1.h264\nsnapurl=http://$RTSP_USERPWD%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=low$WATERMARK\ntype=H264"
     fi
     if [[ $1 == "both" ]]; then
-        ONVIF_PROFILE_0="--name Profile_0 --width $HIGHWIDTH --height $HIGHHEIGHT --url rtsp://%s$D_RTSP_PORT/ch0_0.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=high$WATERMARK --type H264"
-        ONVIF_PROFILE_1="--name Profile_1 --width 640 --height 360 --url rtsp://%s$D_RTSP_PORT/ch0_1.h264 --snapurl http://%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=low$WATERMARK --type H264"
+        ONVIF_PROFILE_0="name=Profile_0\nwidth=$HIGHWIDTH\nheight=$HIGHHEIGHT\nurl=rtsp://$RTSP_USERPWD%s$D_RTSP_PORT/ch0_0.h264\nsnapurl=http://$RTSP_USERPWD%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=high$WATERMARK\ntype=H264"
+        ONVIF_PROFILE_1="name=Profile_1\nwidth=640\nheight=360\nurl=rtsp://$RTSP_USERPWD%s$D_RTSP_PORT/ch0_1.h264\nsnapurl=http://$RTSP_USERPWD%s$D_HTTPD_PORT/cgi-bin/snapshot.sh?res=low$WATERMARK\ntype=H264"
+    fi
+
+    ONVIF_SRVD_CONF="/tmp/onvif_simple_server.conf"
+
+    echo "model=Yi Hack" > $ONVIF_SRVD_CONF
+    echo "manufacturer=Yi" >> $ONVIF_SRVD_CONF
+    echo "firmware_ver=$YI_HACK_VER" >> $ONVIF_SRVD_CONF
+    echo "hardware_id=$HW_ID" >> $ONVIF_SRVD_CONF
+    echo "serial_num=$SERIAL_NUMBER" >> $ONVIF_SRVD_CONF
+    echo "ifs=$ONVIF_NETIF" >> $ONVIF_SRVD_CONF
+    echo "port=$HTTPD_PORT" >> $ONVIF_SRVD_CONF
+    echo "scope=onvif://www.onvif.org/Profile/Streaming" >> $ONVIF_SRVD_CONF
+    echo "" >> $ONVIF_SRVD_CONF
+    if [ ! -z $ONVIF_USERPWD ]; then
+        echo -e $ONVIF_USERPWD >> $ONVIF_SRVD_CONF
+        echo "" >> $ONVIF_SRVD_CONF
+    fi
+    if [ ! -z $ONVIF_PROFILE_0 ]; then
+        echo "#Profile 0" >> $ONVIF_SRVD_CONF
+        echo -e $ONVIF_PROFILE_0 >> $ONVIF_SRVD_CONF
+        echo "" >> $ONVIF_SRVD_CONF
+    fi
+    if [ ! -z $ONVIF_PROFILE_1 ]; then
+        echo "#Profile 1" >> $ONVIF_SRVD_CONF
+        echo -e $ONVIF_PROFILE_1 >> $ONVIF_SRVD_CONF
+        echo "" >> $ONVIF_SRVD_CONF
     fi
 
     if [[ $MODEL_SUFFIX == "yi_dome" ]] || [[ $MODEL_SUFFIX == "yi_dome_1080p" ]] || [[ $MODEL_SUFFIX == "yi_cloud_dome_1080p" ]] ; then
-        onvif_srvd --pid_file /var/run/onvif_srvd.pid --model "$MODEL_SUFFIX" --manufacturer "Yi" --firmware_ver "$YI_HACK_VER" --hardware_id $HW_ID --serial_num $SERIAL_NUMBER --ifs $ONVIF_NETIF --port $ONVIF_PORT --scope onvif://www.onvif.org/Profile/S $ONVIF_PROFILE_0 $ONVIF_PROFILE_1 $ONVIF_USERPWD --ptz --move_left "/tmp/sd/yi-hack-v5/bin/ipc_cmd -m left" --move_right "/tmp/sd/yi-hack-v5/bin/ipc_cmd -m right" --move_up "/tmp/sd/yi-hack-v5/bin/ipc_cmd -m up" --move_down "/tmp/sd/yi-hack-v5/bin/ipc_cmd -m down" --move_stop "/tmp/sd/yi-hack-v5/bin/ipc_cmd -m stop" --move_preset "/tmp/sd/yi-hack-v5/bin/ipc_cmd -p %t"
-    else
-        onvif_srvd --pid_file /var/run/onvif_srvd.pid --model "$MODEL_SUFFIX" --manufacturer "Yi" --firmware_ver "$YI_HACK_VER" --hardware_id $HW_ID --serial_num $SERIAL_NUMBER --ifs $ONVIF_NETIF --port $ONVIF_PORT --scope onvif://www.onvif.org/Profile/S $ONVIF_PROFILE_0 $ONVIF_PROFILE_1 $ONVIF_USERPWD
+        echo "#PTZ" >> $ONVIF_SRVD_CONF
+        echo "ptz=1" >> $ONVIF_SRVD_CONF
+        echo "get_position=/tmp/sd/yi-hack-v5/bin/ipc_cmd -g" >> $ONVIF_SRVD_CONF
+        echo "move_left=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m left" >> $ONVIF_SRVD_CONF
+        echo "move_right=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m right" >> $ONVIF_SRVD_CONF
+        echo "move_up=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m up" >> $ONVIF_SRVD_CONF
+        echo "move_down=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m down" >> $ONVIF_SRVD_CONF
+        echo "move_stop=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m stop" >> $ONVIF_SRVD_CONF
+        echo "move_preset=/tmp/sd/yi-hack-v5/bin/ipc_cmd -p %d" >> $ONVIF_SRVD_CONF
+        echo "set_preset=/tmp/sd/yi-hack-v5/script/ptz_presets.sh -a add_preset -m %s" >> $ONVIF_SRVD_CONF
+        echo "set_home_position=/tmp/sd/yi-hack-v5/script/ptz_presets.sh -a set_home_position" >> $ONVIF_SRVD_CONF
+        echo "remove_preset=/tmp/sd/yi-hack-v5/script/ptz_presets.sh -a del_preset -n %d" >> $ONVIF_SRVD_CONF
+        echo "jump_to_abs=/tmp/sd/yi-hack-v5/bin/ipc_cmd -j %f,%f" >> $ONVIF_SRVD_CONF
+        echo "jump_to_rel=/tmp/sd/yi-hack-v5/bin/ipc_cmd -J %f,%f" >> $ONVIF_SRVD_CONF
+        echo "get_presets=/tmp/sd/yi-hack-v5/script/ptz_presets.sh -a get_presets" >> $ONVIF_SRVD_CONF
+        echo "" >> $ONVIF_SRVD_CONF
     fi
+
+    echo "#EVENT" >> $ONVIF_SRVD_CONF
+    echo "events=3" >> $ONVIF_SRVD_CONF
+    echo "#Event 0" >> $ONVIF_SRVD_CONF
+    echo "topic=tns1:VideoSource/MotionAlarm" >> $ONVIF_SRVD_CONF
+    echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+    echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+    echo "input_file=/tmp/onvif_notify_server/motion_alarm" >> $ONVIF_SRVD_CONF
+    echo "#Event 1" >> $ONVIF_SRVD_CONF
+    echo "topic=tns1:RuleEngine/MyRuleDetector/PeopleDetect" >> $ONVIF_SRVD_CONF
+    echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+    echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+    echo "input_file=/tmp/onvif_notify_server/human_detection" >> $ONVIF_SRVD_CONF
+    echo "#Event 2" >> $ONVIF_SRVD_CONF
+    echo "topic=tns1:RuleEngine/MyRuleDetector/VehicleDetect" >> $ONVIF_SRVD_CONF
+    echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+    echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+    echo "input_file=/tmp/onvif_notify_server/vehicle_detection" >> $ONVIF_SRVD_CONF
+    echo "#Event 3" >> $ONVIF_SRVD_CONF
+    echo "topic=tns1:RuleEngine/MyRuleDetector/DogCatDetect" >> $ONVIF_SRVD_CONF
+    echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+    echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+    echo "input_file=/tmp/onvif_notify_server/animal_detection" >> $ONVIF_SRVD_CONF
+    echo "#Event 4" >> $ONVIF_SRVD_CONF
+    echo "topic=tns1:RuleEngine/MyRuleDetector/BabyCryingDetect" >> $ONVIF_SRVD_CONF
+    echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+    echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+    echo "input_file=/tmp/onvif_notify_server/baby_crying" >> $ONVIF_SRVD_CONF
+    echo "#Event 5" >> $ONVIF_SRVD_CONF
+    echo "topic=tns1:AudioAnalytics/Audio/DetectedSound" >> $ONVIF_SRVD_CONF
+    echo "source_name=VideoSourceConfigurationToken" >> $ONVIF_SRVD_CONF
+    echo "source_value=VideoSourceToken" >> $ONVIF_SRVD_CONF
+    echo "input_file=/tmp/onvif_notify_server/sound_detection" >> $ONVIF_SRVD_CONF
+
+    chmod 0600 $ONVIF_SRVD_CONF
+    onvif_simple_server --conf_file $ONVIF_SRVD_CONF
+    ipc2file
+    onvif_notify_server --conf_file $ONVIF_SRVD_CONF
 }
 
 stop_onvif()
 {
-    killall onvif_srvd
+    killall onvif_notify_server
+    killall ipc2file
+    killall onvif_simple_server
 }
 
 start_wsdd()
 {
-    wsdd --pid_file /var/run/wsdd.pid --if_name wlan0 --type tdn:NetworkVideoTransmitter --xaddr "http://%s$D_ONVIF_PORT" --scope "onvif://www.onvif.org/name/Unknown onvif://www.onvif.org/Profile/Streaming"
+    wsd_simple_server --pid_file /var/run/wsd_simple_server.pid --if_name $ONVIF_NETIF --xaddr "http://%s$D_HTTPD_PORT/onvif/device_service" -m yi_hack -n Yi
 }
 
 stop_wsdd()
 {
-    killall wsdd
+    killall wsd_simple_server
 }
 
 start_ftpd()
@@ -182,6 +254,16 @@ ps_program()
     fi
 }
 
+. $YI_HACK_PREFIX/www/cgi-bin/validate.sh
+
+if ! $(validateQueryString $QUERY_STRING); then
+    printf "Content-type: application/json\r\n\r\n"
+    printf "{\n"
+    printf "\"%s\":\"%s\"\\n" "error" "true"
+    printf "}"
+    exit
+fi
+
 NAME="none"
 ACTION="none"
 PARAM1="none"
@@ -208,7 +290,7 @@ init_config
 
 if [ "$ACTION" == "start" ] ; then
     if [ "$NAME" == "rtsp" ]; then
-        start_rtsp $PARAM1
+        start_rtsp $PARAM1 $PARAM2
     elif [ "$NAME" == "onvif" ]; then
         start_onvif $PARAM1 $PARAM2
     elif [ "$NAME" == "wsdd" ]; then
@@ -216,20 +298,20 @@ if [ "$ACTION" == "start" ] ; then
     elif [ "$NAME" == "ftpd" ]; then
         start_ftpd $PARAM1
     elif [ "$NAME" == "mqtt" ]; then
-        mqttv4 >/dev/null &
-        mqtt-config >/dev/null &
+        mqttv4 > /dev/null &
+        mqtt-config > /dev/null &
     elif [ "$NAME" == "mp4record" ]; then
         cd /home/app
-        ./mp4record >/dev/null &
+        ./mp4record > /dev/null &
     elif [ "$NAME" == "all" ]; then
         start_rtsp
         start_onvif
         start_wsdd
         start_ftpd
-        mqttv4 >/dev/null &
-        mqtt-config >/dev/null &
+        mqttv4 > /dev/null &
+        mqtt-config > /dev/null &
         cd /home/app
-        ./mp4record >/dev/null &
+        ./mp4record > /dev/null &
     fi
 elif [ "$ACTION" == "stop" ] ; then
     if [ "$NAME" == "rtsp" ]; then
@@ -258,9 +340,9 @@ elif [ "$ACTION" == "status" ] ; then
     if [ "$NAME" == "rtsp" ]; then
         RES=$(ps_program rRTSPServer)
     elif [ "$NAME" == "onvif" ]; then
-        RES=$(ps_program onvif_srvd)
+        RES=$(ps_program onvif_simple_server)
     elif [ "$NAME" == "wsdd" ]; then
-        RES=$(ps_program wsdd)
+        RES=$(ps_program wsd_simple_server)
     elif [ "$NAME" == "ftpd" ]; then
         RES=$(ps_program ftpd)
     elif [ "$NAME" == "mqtt" ]; then
diff --git a/src/www/httpd/htdocs/js/modules/configurations.js b/src/www/httpd/htdocs/js/modules/configurations.js
index 6add4fb..7320b49 100644
--- a/src/www/httpd/htdocs/js/modules/configurations.js
+++ b/src/www/httpd/htdocs/js/modules/configurations.js
@@ -25,7 +25,7 @@ APP.configurations = (function ($) {
                 loadingStatusElem.fadeOut(500);
 
                 $.each(response, function (key, state) {
-                    if(key=="HOSTNAME" || key=="TIMEZONE" || key=="NTP_SERVER" || key=="HTTPD_PORT" || key=="RTSP_PORT" || key=="ONVIF_PORT" || key=="USERNAME")
+                    if(key=="HOSTNAME" || key=="TIMEZONE" || key=="NTP_SERVER" || key=="HTTPD_PORT" || key=="RTSP_PORT" || key=="USERNAME")
                         $('input[type="text"][data-key="' + key +'"]').prop('value', state);
                     else if(key=="RTSP_STREAM" || key=="RTSP_AUDIO" || key=="ONVIF_PROFILE" || key=="ONVIF_NETIF")
                         $('select[data-key="' + key +'"]').prop('value', state);
@@ -70,7 +70,6 @@ APP.configurations = (function ($) {
         configs["RTSP_STREAM"] = $('select[data-key="RTSP_STREAM"]').prop('value');
         configs["RTSP_AUDIO"] = $('select[data-key="RTSP_AUDIO"]').prop('value');
         configs["RTSP_PORT"] = $('input[type="text"][data-key="RTSP_PORT"]').prop('value');
-        configs["ONVIF_PORT"] = $('input[type="text"][data-key="ONVIF_PORT"]').prop('value');
         configs["ONVIF_PROFILE"] = $('select[data-key="ONVIF_PROFILE"]').prop('value');
         configs["ONVIF_NETIF"] = $('select[data-key="ONVIF_NETIF"]').prop('value');
         configs["USERNAME"] = $('input[type="text"][data-key="USERNAME"]').prop('value');
diff --git a/src/www/httpd/htdocs/pages/configurations.html b/src/www/httpd/htdocs/pages/configurations.html
index 1249f0a..7cd15d0 100644
--- a/src/www/httpd/htdocs/pages/configurations.html
+++ b/src/www/httpd/htdocs/pages/configurations.html
@@ -322,21 +322,12 @@ <h4 class="no-margin">TCP ports</h4>
                             </span>
                         </td>
                     </tr>
-                    <tr class="row">
-                        <td>ONVIF Port</td>
-                        <td>
-                            <input class="u-full-width" type="text" placeholder="" data-key="ONVIF_PORT" id="ONVIF_PORT"/>
-                            <span class="switch-description">
-                                TCP port used by ONVIF Server (default 80).
-                            </span>
-                        </td>
-                    </tr>
                     <tr class="row">
                         <td>HTTPD Port</td>
                         <td>
                             <input class="u-full-width" type="text" placeholder="" data-key="HTTPD_PORT" id="HTTPD_PORT"/>
                             <span class="switch-description">
-                                TCP port used by HTTPD Server (default 8080).
+                                TCP port used by HTTPD Server (default 80).
                             </span>
                         </td>
                     </tr>

From 053e47faa7c32c06a961bd4c23788abe1c7e5af4 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Fri, 26 Jan 2024 14:04:34 +0100
Subject: [PATCH 56/81] Update .gitignore

---
 src/curl/.gitignore     | 2 +-
 src/snapshot/.gitignore | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/curl/.gitignore b/src/curl/.gitignore
index e014e8e..cc1f9db 100755
--- a/src/curl/.gitignore
+++ b/src/curl/.gitignore
@@ -1,3 +1,3 @@
 # Ignore the install dir
 _install/
-
+openssl*
diff --git a/src/snapshot/.gitignore b/src/snapshot/.gitignore
index 9cd7c97..9ca2b40 100644
--- a/src/snapshot/.gitignore
+++ b/src/snapshot/.gitignore
@@ -1,8 +1,8 @@
 # Ignore the install dir
 _install/
 snapshot/SDK
-snapshot/jpeg-9c
-snapshot/ffmpeg-4.0.4
+snapshot/jpeg-9e
+snapshot/ffmpeg-6.0
 snapshot/add_water.o
 snapshot/convert2jpg.o
 snapshot/imggrabber

From e5062db37cdb07ea2a0159f24c925634eed8ee45 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Fri, 26 Jan 2024 14:05:14 +0100
Subject: [PATCH 57/81] Remove wsdd submodule

---
 .gitmodules               |   4 -
 src/wsdd/.gitignore       |   3 -
 src/wsdd/Makefile.wsdd    | 251 --------------------------------------
 src/wsdd/cleanup.wsdd     |  10 --
 src/wsdd/compile.wsdd     |  21 ----
 src/wsdd/init.wsdd        |  16 ---
 src/wsdd/install.wsdd     |   8 --
 src/wsdd/ip_mreqn.patch   |  11 --
 src/wsdd/lock_error.patch |  28 -----
 src/wsdd/wsdd             |   1 -
 10 files changed, 353 deletions(-)
 delete mode 100644 src/wsdd/.gitignore
 delete mode 100644 src/wsdd/Makefile.wsdd
 delete mode 100755 src/wsdd/cleanup.wsdd
 delete mode 100755 src/wsdd/compile.wsdd
 delete mode 100755 src/wsdd/init.wsdd
 delete mode 100755 src/wsdd/install.wsdd
 delete mode 100644 src/wsdd/ip_mreqn.patch
 delete mode 100644 src/wsdd/lock_error.patch
 delete mode 160000 src/wsdd/wsdd

diff --git a/.gitmodules b/.gitmodules
index 42899d0..4c1bd58 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -26,10 +26,6 @@
 	path = src/mosquitto/mosquitto
 	url = https://github.com/eclipse/mosquitto.git
 	ignore = dirty
-[submodule "src/wsdd/wsdd"]
-	path = src/wsdd/wsdd
-	url = https://github.com/KoynovStas/wsdd.git
-	ignore = dirty
 [submodule "src/libfuse/libfuse"]
 	path = src/libfuse/libfuse
 	url = https://github.com/libfuse/libfuse.git
diff --git a/src/wsdd/.gitignore b/src/wsdd/.gitignore
deleted file mode 100644
index cfea062..0000000
--- a/src/wsdd/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Ignore the install dir
-_install/
-wsdd/
diff --git a/src/wsdd/Makefile.wsdd b/src/wsdd/Makefile.wsdd
deleted file mode 100644
index 535da65..0000000
--- a/src/wsdd/Makefile.wsdd
+++ /dev/null
@@ -1,251 +0,0 @@
-DAEMON_NAME           = wsdd
-DAEMON_MAJOR_VERSION  = 2
-DAEMON_MINOR_VERSION  = 1
-DAEMON_PATCH_VERSION  = 0
-DAEMON_PID_FILE_NAME  = $(DAEMON_NAME).pid
-DAEMON_LOG_FILE_NAME  = $(DAEMON_NAME).log
-DAEMON_NO_CHDIR       = 1
-DAEMON_NO_CLOSE_STDIO = 0
-
-
-GSOAP_VERSION     = 2.8.92
-GSOAP_DIR         = ./gsoap-2.8/gsoap
-GSOAP_PLUGIN_DIR  = $(GSOAP_DIR)/plugin
-GSOAP_IMPORT_DIR  = $(GSOAP_DIR)/import
-
-
-SOAPCPP2          = $(GSOAP_DIR)/src/soapcpp2
-WSDL2H            = $(GSOAP_DIR)/wsdl/wsdl2h
-
-
-COMMON_DIR        = ./src
-GENERATED_DIR     = ./generated
-
-
-CFLAGS            = -DDAEMON_NAME='"$(DAEMON_NAME)"'
-CFLAGS           += -DDAEMON_MAJOR_VERSION=$(DAEMON_MAJOR_VERSION)
-CFLAGS           += -DDAEMON_MINOR_VERSION=$(DAEMON_MINOR_VERSION)
-CFLAGS           += -DDAEMON_PATCH_VERSION=$(DAEMON_PATCH_VERSION)
-CFLAGS           += -DDAEMON_PID_FILE_NAME='"$(DAEMON_PID_FILE_NAME)"'
-CFLAGS           += -DDAEMON_LOG_FILE_NAME='"$(DAEMON_LOG_FILE_NAME)"'
-CFLAGS           += -DDAEMON_NO_CHDIR=$(DAEMON_NO_CHDIR)
-CFLAGS           += -DDAEMON_NO_CLOSE_STDIO=$(DAEMON_NO_CLOSE_STDIO)
-
-CFLAGS           += -I$(COMMON_DIR)
-CFLAGS           += -I$(GENERATED_DIR)
-CFLAGS           += -I$(GSOAP_DIR) -I$(GSOAP_PLUGIN_DIR) -I$(GSOAP_IMPORT_DIR)
-CFLAGS           += -O2  -Wall  -pipe
-CFLAGS           += -DWITH_NO_C_LOCALE
-
-GCC              ?=  g++
-
-
-
-
-SOAP_SRC = $(GSOAP_DIR)/stdsoap2.c         \
-           $(GSOAP_PLUGIN_DIR)/wsaapi.c    \
-           $(GSOAP_PLUGIN_DIR)/wsddapi.c   \
-           $(GENERATED_DIR)/soapClient.c
-
-
-
-# Add your source files to the list.
-# Supported *.c  *.cpp  *.S files.
-# For other file types write a template rule for build, see below.
-SOURCES  = $(COMMON_DIR)/$(DAEMON_NAME).c   \
-           $(COMMON_DIR)/daemon.c           \
-           $(COMMON_DIR)/net_utils.c        \
-           $(COMMON_DIR)/file_utils.c       \
-           $(COMMON_DIR)/wsdd_utils.c       \
-           $(COMMON_DIR)/client_events.c    \
-           $(GENERATED_DIR)/soapC.c         \
-           $(SOAP_SRC)
-
-
-
-
-
-OBJECTS  := $(patsubst %.c,  %.o, $(SOURCES) )
-OBJECTS  := $(patsubst %.cpp,%.o, $(OBJECTS) )
-OBJECTS  := $(patsubst %.S,  %.o, $(OBJECTS) )
-
-
-DEBUG_SUFFIX   = debug
-
-DEBUG_OBJECTS := $(patsubst %.o, %_$(DEBUG_SUFFIX).o, $(OBJECTS) )
-
-
-
-
-.PHONY: all
-all: debug release
-
-
-
-.PHONY: release
-release: CFLAGS := -s  $(CFLAGS)
-release: $(DAEMON_NAME)
-
-
-
-.PHONY: debug
-debug: DAEMON_NO_CLOSE_STDIO = 1
-debug: CFLAGS := -DDEBUG  -g  $(CFLAGS)
-debug: $(DAEMON_NAME)_$(DEBUG_SUFFIX)
-
-
-
-# release
-$(DAEMON_NAME): .depend $(OBJECTS)
-	$(call build_bin, $(OBJECTS))
-
-
-# debug
-$(DAEMON_NAME)_$(DEBUG_SUFFIX): .depend $(DEBUG_OBJECTS)
-	$(call build_bin, $(DEBUG_OBJECTS))
-
-
-
-# Build release objects
-%.o: %.c
-	$(build_object)
-
-
-%.o: %.cpp
-	$(build_object)
-
-
-%.o: %.S
-	$(build_object)
-
-
-
-# Build debug objects
-%_$(DEBUG_SUFFIX).o: %.c
-	$(build_object)
-
-
-%_$(DEBUG_SUFFIX).o: %.cpp
-	$(build_object)
-
-
-%_$(DEBUG_SUFFIX).o: %.S
-	$(build_object)
-
-
-
-.PHONY: clean
-clean:
-	-@rm -f $(DAEMON_NAME)
-	-@rm -f $(DAEMON_NAME)_$(DEBUG_SUFFIX)
-	-@rm -f $(OBJECTS)
-	-@rm -f $(DEBUG_OBJECTS)
-	-@rm -f .depend
-	-@rm -f -d -R $(GENERATED_DIR)
-	-@rm -f *.*~
-
-
-
-.PHONY: distclean
-distclean: clean
-	-@rm -f -d -R SDK
-	-@rm -f -d -R gsoap-2.8
-	-@rm -f RECV.log SENT.log TEST.log
-
-
-
-.depend: $(GENERATED_DIR)/soapC.c
-	-@rm -f .depend
-	@echo "Generating dependencies..."
-	@for src in $(SOURCES) ; do \
-        echo "  [depend]  $$src" ; \
-        $(GCC) $(CFLAGS) -MT ".depend $${src%.*}.o $${src%.*}_$(DEBUG_SUFFIX).o" -MM $$src >> .depend ; \
-    done
-
-
-
-ifeq "$(findstring $(MAKECMDGOALS),clean distclean)"  ""
-    include $(wildcard .depend)
-endif
-
-
-
-
-# ---- gSOAP ----
-
-$(GENERATED_DIR)/wsdd.h:
-	@$(build_gsoap)
-	@mkdir -p $(GENERATED_DIR)
-	$(WSDL2H) -cg -t $(GSOAP_DIR)/WS/typemap.dat  -o $@  wsdl/remotediscovery.wsdl
-
-
-
-$(GENERATED_DIR)/soapC.c: $(GENERATED_DIR)/wsdd.h
-	$(SOAPCPP2) -C -L -x -c -2 -d $(GENERATED_DIR) -I$(GSOAP_DIR):$(GSOAP_IMPORT_DIR) $<
-
-
-
-# This targets is needed for parallel work of make
-$(OBJECTS) $(DEBUG_OBJECTS) $(SOAP_SRC): $(GENERATED_DIR)/soapC.c
-
-
-
-
-
-# Common commands
-BUILD_ECHO = echo "\n  [build]  $@:"
-
-
-define build_object
-    @$(BUILD_ECHO)
-    $(GCC) -c $< -o $@  $(CFLAGS)
-endef
-
-
-
-define build_bin
-    @$(BUILD_ECHO)
-    $(GCC)  $1 -o $@  $(CFLAGS)
-    @echo "\n---- Compiled $@ ver $(DAEMON_MAJOR_VERSION).$(DAEMON_MINOR_VERSION).$(DAEMON_PATCH_VERSION) ----\n"
-endef
-
-
-
-define build_gsoap
-
-    # get archive
-    if [ ! -f SDK/gsoap.zip ]; then \
-        mkdir -p SDK; \
-        wget -O ./SDK/gsoap.zip.tmp "http://dl.t2-project.org/mirror/trunk/g/gsoap_2.8.92.zip" || \
-        wget -O ./SDK/gsoap.zip.tmp "https://sourceforge.net/projects/gsoap2/files/gsoap-2.8/gsoap_2.8.92.zip/download" && \
-        mv ./SDK/gsoap.zip.tmp ./SDK/gsoap.zip; \
-    fi
-
-    # unzip
-    if [ ! -f gsoap-2.8/README.txt ]; then \
-         unzip ./SDK/gsoap.zip; \
-    fi
-
-    # build
-    if [ ! -f $(SOAPCPP2) ] || [ ! -f $(WSDL2H) ]; then \
-         cd gsoap-2.8; \
-         ./configure --disable-c-locale && \
-         make -j1; \
-         cd ..;\
-    fi
-endef
-
-
-
-
-.PHONY: help
-help:
-	@echo "make [command]"
-	@echo "command is:"
-	@echo "   all       -  build daemon in release and debug mode"
-	@echo "   debug     -  build in debug mode (#define DEBUG 1)"
-	@echo "   release   -  build in release mode (strip)"
-	@echo "   clean     -  remove all generated files"
-	@echo "   distclean -  clean + remove all SDK files"
-	@echo "   help      -  this help"
-
diff --git a/src/wsdd/cleanup.wsdd b/src/wsdd/cleanup.wsdd
deleted file mode 100755
index 216b675..0000000
--- a/src/wsdd/cleanup.wsdd
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR=$(cd `dirname $0` && pwd)
-cd $SCRIPT_DIR
-
-cd wsdd
-
-make clean
-rm -rf SDK
-rm -rf gsoap-2.8
diff --git a/src/wsdd/compile.wsdd b/src/wsdd/compile.wsdd
deleted file mode 100755
index 81abfbd..0000000
--- a/src/wsdd/compile.wsdd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-export PATH=${PATH}:/opt/arm-hisiv300-linux/bin
-
-export TARGET=arm-hisiv300-linux-uclibcgnueabi
-export CROSS=arm-hisiv300-linux-uclibcgnueabi
-export BUILD=x86_64-pc-linux-gnu
-
-export CROSSPREFIX=${CROSS}-
-
-export GCC=${CROSSPREFIX}g++
-
-SCRIPT_DIR=$(cd `dirname $0` && pwd)
-cd $SCRIPT_DIR
-
-cd wsdd || exit 1
-
-make clean
-make release || exit 1
-mkdir -p $SCRIPT_DIR/_install/bin
-cp wsdd $SCRIPT_DIR/_install/bin/
diff --git a/src/wsdd/init.wsdd b/src/wsdd/init.wsdd
deleted file mode 100755
index b7da846..0000000
--- a/src/wsdd/init.wsdd
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR=$(cd `dirname $0` && pwd)
-cd $SCRIPT_DIR
-
-rm -rf ./_install
-
-cd wsdd || exit 1
-git reset --hard || exit 1
-
-cd ..
-
-patch -p0 < lock_error.patch
-patch -p0 < ip_mreqn.patch
-
-cp Makefile.wsdd wsdd/Makefile
diff --git a/src/wsdd/install.wsdd b/src/wsdd/install.wsdd
deleted file mode 100755
index 50e54cc..0000000
--- a/src/wsdd/install.wsdd
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR=$(cd `dirname $0` && pwd)
-cd $SCRIPT_DIR
-
-mkdir -p ../../build/home/yi-hack-v5/bin/ || exit 1
-
-rsync -a ./_install/bin/wsdd ../../build/home/yi-hack-v5/bin/
diff --git a/src/wsdd/ip_mreqn.patch b/src/wsdd/ip_mreqn.patch
deleted file mode 100644
index 1fd0f62..0000000
--- a/src/wsdd/ip_mreqn.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur wsdd.ori/src/wsdd.c wsdd/src/wsdd.c
---- wsdd.ori/src/wsdd.c	2020-08-06 20:42:04.123972145 +0200
-+++ wsdd/src/wsdd.c	2020-08-06 20:37:38.000000000 +0200
-@@ -340,6 +340,7 @@
-     }
- 
-     setsockopt(soap_srv->master, IPPROTO_IP, IP_MULTICAST_IF, &mcast.imr_address.s_addr, sizeof(struct in_addr));
-+    mcast.imr_ifindex = 0;
- 
-     if(setsockopt(soap_srv->master, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *)&mcast, sizeof(mcast)) != 0 )
-     {
diff --git a/src/wsdd/lock_error.patch b/src/wsdd/lock_error.patch
deleted file mode 100644
index 77cf45f..0000000
--- a/src/wsdd/lock_error.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur wsdd.ori/src/daemon.c wsdd/src/daemon.c
---- wsdd.ori/src/daemon.c	2020-06-22 14:30:19.000000000 +0200
-+++ wsdd/src/daemon.c	2020-06-22 14:29:17.000000000 +0200
-@@ -45,6 +45,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
-+#include <fcntl.h>
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -206,11 +207,11 @@
-         return -1; // Could not create on PID file
- 
- 
--    if( lockf(fd, F_TLOCK, 0) == -1 )
--    {
--        close(fd);
--        return -1; // Could not get lock on PID file
--    }
-+//    if( lockf(fd, F_TLOCK, 0) == -1 )
-+//    {
-+//        close(fd);
-+//        return -1; // Could not get lock on PID file
-+//    }
- 
- 
-     if( ftruncate(fd, 0) != 0 )
diff --git a/src/wsdd/wsdd b/src/wsdd/wsdd
deleted file mode 160000
index f9d61ed..0000000
--- a/src/wsdd/wsdd
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f9d61ed16178fc376d73757ee283b303bff44870

From 06e5c1f258f753e26698c412b177cb276979b615 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Fri, 26 Jan 2024 14:19:04 +0100
Subject: [PATCH 58/81] Fix installation path

---
 src/onvif_simple_server/install.onvif_simple_server | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/onvif_simple_server/install.onvif_simple_server b/src/onvif_simple_server/install.onvif_simple_server
index 9d6841b..099379b 100755
--- a/src/onvif_simple_server/install.onvif_simple_server
+++ b/src/onvif_simple_server/install.onvif_simple_server
@@ -3,7 +3,7 @@
 SCRIPT_DIR=$(cd `dirname $0` && pwd)
 cd $SCRIPT_DIR
 
-mkdir -p ../../build/home/yi-hack/www/onvif || exit 1
-mkdir -p ../../build/home/yi-hack/bin/ || exit 1
+mkdir -p ../../build/home/yi-hack-v5/www/onvif || exit 1
+mkdir -p ../../build/home/yi-hack-v5/bin/ || exit 1
 
-rsync -av ./_install/* ../../build/home/yi-hack/ || exit 1
+rsync -av ./_install/* ../../build/home/yi-hack-v5/ || exit 1

From 7021fa050482a64b86afb6c93db73879766c6710 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Fri, 26 Jan 2024 19:03:44 +0100
Subject: [PATCH 59/81] Replace symlinks with .sh

---
 src/onvif_simple_server/compile.onvif_simple_server | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/onvif_simple_server/compile.onvif_simple_server b/src/onvif_simple_server/compile.onvif_simple_server
index 21f800d..44efe7a 100755
--- a/src/onvif_simple_server/compile.onvif_simple_server
+++ b/src/onvif_simple_server/compile.onvif_simple_server
@@ -36,10 +36,15 @@ mkdir -p ../_install/etc/onvif_notify_server || exit 1
 mkdir -p ../_install/etc/wsd_simple_server || exit 1
 
 cp ./onvif_simple_server ../_install/www/onvif || exit 1
-ln -s onvif_simple_server ../_install/www/onvif/device_service
-ln -s onvif_simple_server ../_install/www/onvif/events_service
-ln -s onvif_simple_server ../_install/www/onvif/media_service
-ln -s onvif_simple_server ../_install/www/onvif/ptz_service
+cp ./onvif_simple_server ../_install/www/onvif || exit 1
+echo "#!/tmp/sd/yi-hack-v5/www/onvif/onvif_simple_server" > ../_install/www/onvif/device_service
+chmod 0755 ../_install/www/onvif/device_service
+echo "#!/tmp/sd/yi-hack-v5/www/onvif/onvif_simple_server" > ../_install/www/onvif/events_service
+chmod 0755 ../_install/www/onvif/events_service
+echo "#!/tmp/sd/yi-hack-v5/www/onvif/onvif_simple_server" > ../_install/www/onvif/media_service
+chmod 0755 ../_install/www/onvif/media_service
+echo "#!/tmp/sd/yi-hack-v5/www/onvif/onvif_simple_server" > ../_install/www/onvif/ptz_service
+chmod 0755 ../_install/www/onvif/ptz_service
 cp -R ./device_service_files ../_install/www/onvif
 cp -R ./events_service_files ../_install/www/onvif
 cp -R ./generic_files ../_install/www/onvif

From 867371af5980e710eb16e7184d00f77c41c61fdb Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Fri, 26 Jan 2024 19:05:15 +0100
Subject: [PATCH 60/81] Add -t parameter to imggrabber

---
 src/snapshot/snapshot/add_water.c  |  1 -
 src/snapshot/snapshot/imggrabber.c | 46 ++++++++++++++++++++++++------
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/snapshot/snapshot/add_water.c b/src/snapshot/snapshot/add_water.c
index 92c943b..336ae9d 100644
--- a/src/snapshot/snapshot/add_water.c
+++ b/src/snapshot/snapshot/add_water.c
@@ -98,7 +98,6 @@ int AddWM (WaterMarkInfo *WM_info, unsigned int bg_width, unsigned int bg_height
         time_info = localtime(&rawtime);
     }else{
         time_info = time_data;
-        time_info->tm_year = time_info->tm_year - 1900;
     }
 
     WM_Param.id_list[0] = (time_info->tm_year + 1900) / 1000;
diff --git a/src/snapshot/snapshot/imggrabber.c b/src/snapshot/snapshot/imggrabber.c
index 67f3b95..68d5cf0 100644
--- a/src/snapshot/snapshot/imggrabber.c
+++ b/src/snapshot/snapshot/imggrabber.c
@@ -276,7 +276,7 @@ int frame_decode(unsigned char *outbuffer, unsigned char *p, int length)
 }
 
 
-int add_watermark(char *buffer, int width, int height)
+int add_watermark(char *buffer, int width, int height, struct tm *watermark_tm)
 {
     int w_res, h_res;
     char path_res[1024];
@@ -300,13 +300,13 @@ int add_watermark(char *buffer, int width, int height)
     } else {
         if (width == 640) {
             AddWM(&WM_info, width, height, buffer,
-                buffer + width*height, width-230, height-20, NULL);
+                buffer + width*height, width-230, height-20, watermark_tm);
         } else if (width == 1280) {
             AddWM(&WM_info, w_res, h_res, buffer,
-                buffer + width*height, width-345, height-30, NULL);
+                buffer + width*height, width-345, height-30, watermark_tm);
         } else {
             AddWM(&WM_info, w_res, h_res, buffer,
-                buffer + width*height, width-460, height-40, NULL);
+                buffer + width*height, width-460, height-40, watermark_tm);
         }
         WMRelease(&WM_info);
     }
@@ -331,6 +331,7 @@ void print_usage(char *prog_name)
     fprintf(stderr, "\t    --frame_length_offset VAL    Set the offset of the frame lenght in the record\n");
     fprintf(stderr, "\t    --frame_type_offset VAL      Set the offset of the frame type in the record\n");
     fprintf(stderr, "\t-w, --watermark                  Add watermark to image\n");
+    fprintf(stderr, "\t-t, --watermark_time             Set the time of the watermark\n");
     fprintf(stderr, "\t-d, --debug                      Enable debug\n");
     fprintf(stderr, "\t-h, --help                       Show this help\n");
 }
@@ -368,6 +369,8 @@ int main(int argc, char **argv) {
     unsigned char *addr;
     int resolution = RESOLUTION_HIGH;
     int watermark = 0;
+    int watermark_time = 0;
+    struct tm watermark_tm;
 
     unsigned char *bufferh264, *bufferyuv;
     int bufferh264_size;
@@ -411,6 +414,7 @@ int main(int argc, char **argv) {
             {"frame_length_offset",  required_argument, 0, '7'},
             {"frame_type_offset",  required_argument, 0, '8'},
             {"watermark",  no_argument, 0, 'w'},
+            {"watermark_time",  required_argument, 0, 't'},
             {"debug",  no_argument, 0, 'd'},
             {"help",  no_argument, 0, 'h'},
             {0, 0, 0, 0}
@@ -418,7 +422,7 @@ int main(int argc, char **argv) {
         /* getopt_long stores the option index here. */
         int option_index = 0;
 
-        c = getopt_long (argc, argv, "r:9:a:m:0:1:2:3:4:5:6:7:8:wdh",
+        c = getopt_long (argc, argv, "r:9:a:m:0:1:2:3:4:5:6:7:8:wt:dh",
                          long_options, &option_index);
 
         /* Detect the end of the options. */
@@ -538,6 +542,25 @@ int main(int argc, char **argv) {
             watermark = 1;
             break;
 
+        case 't':
+            {
+                int d0, d1, d2, d3, d4, d5, d6;
+                d0 = sscanf(optarg, "%d-%d-%d %d:%d:%d", &d1, &d2, &d3, &d4, &d5 ,&d6);
+                if (d0 == 6) {
+                    watermark_tm.tm_year = d1 - 1900;
+                    watermark_tm.tm_mon = d2 - 1;
+                    watermark_tm.tm_mday = d3;
+                    watermark_tm.tm_hour = d4;
+                    watermark_tm.tm_min = d5;
+                    watermark_tm.tm_sec = d6;
+                    watermark_time = 1;
+                } else {
+                    print_usage(argv[0]);
+                    exit(EXIT_FAILURE);
+                }
+                break;
+            }
+
         case '0':
         case '1':
         case '2':
@@ -773,9 +796,16 @@ int main(int argc, char **argv) {
 
     if (watermark) {
         if (debug) fprintf(stderr, "Adding watermark\n");
-        if (add_watermark(bufferyuv, width, height) < 0) {
-            fprintf(stderr, "Error adding watermark\n");
-            return -8;
+        if (watermark_time == 1) {
+            if (add_watermark(bufferyuv, width, height, &watermark_tm) < 0) {
+                fprintf(stderr, "Error adding watermark\n");
+                return -8;
+            }
+        } else {
+            if (add_watermark(bufferyuv, width, height, NULL) < 0) {
+                fprintf(stderr, "Error adding watermark\n");
+                return -8;
+            }
         }
     }
 

From 30ea52d4829515220925f1efdee3a8d5af915f59 Mon Sep 17 00:00:00 2001
From: Minims <github@minims.fr>
Date: Fri, 26 Jan 2024 21:08:43 +0100
Subject: [PATCH 61/81] fix: WARNING in HA => MQTT entity name starts with the
 device name in your config

---
 .../mqtt_advertise/mqtt_adv_homeassistant.sh  | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/static/static/home/yi-hack-v5/script/mqtt_advertise/mqtt_adv_homeassistant.sh b/src/static/static/home/yi-hack-v5/script/mqtt_advertise/mqtt_adv_homeassistant.sh
index 3cea080..a2107d5 100755
--- a/src/static/static/home/yi-hack-v5/script/mqtt_advertise/mqtt_adv_homeassistant.sh
+++ b/src/static/static/home/yi-hack-v5/script/mqtt_advertise/mqtt_adv_homeassistant.sh
@@ -97,61 +97,61 @@ if [ "$MQTT_ADV_INFO_GLOBAL_ENABLE" == "yes" ]; then
         QOS=""
     fi
     #Hostname
-    UNIQUE_NAME=$NAME" Hostname"
+    UNIQUE_NAME="Hostname"
     UNIQUE_ID=$IDENTIFIERS"-hostname"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/sensor/$IDENTIFIERS/hostname/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:network","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_INFO_GLOBAL_TOPIC'","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.hostname }}", "platform": "mqtt"}'
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
     #IP
-    UNIQUE_NAME=$NAME" Local IP"
+    UNIQUE_NAME="Local IP"
     UNIQUE_ID=$IDENTIFIERS"-local_ip"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/sensor/$IDENTIFIERS/local_ip/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:ip","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_INFO_GLOBAL_TOPIC'","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.local_ip }}", "platform": "mqtt"}'
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
     #Netmask
-    UNIQUE_NAME=$NAME" Netmask"
+    UNIQUE_NAME="Netmask"
     UNIQUE_ID=$IDENTIFIERS"-netmask"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/sensor/$IDENTIFIERS/netmask/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:ip","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_INFO_GLOBAL_TOPIC'","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.netmask }}", "platform": "mqtt"}'
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
     #Gateway
-    UNIQUE_NAME=$NAME" Gateway"
+    UNIQUE_NAME="Gateway"
     UNIQUE_ID=$IDENTIFIERS"-gateway"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/sensor/$IDENTIFIERS/gateway/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:ip","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_INFO_GLOBAL_TOPIC'","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.gateway }}", "platform": "mqtt"}'
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
     #WLan ESSID
-    UNIQUE_NAME=$NAME" WiFi ESSID"
+    UNIQUE_NAME="WiFi ESSID"
     UNIQUE_ID=$IDENTIFIERS"-wlan_essid"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/sensor/$IDENTIFIERS/wlan_essid/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:wifi","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_INFO_GLOBAL_TOPIC'","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.wlan_essid }}", "platform": "mqtt"}'
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
     #Mac Address
-    UNIQUE_NAME=$NAME" Mac Address"
+    UNIQUE_NAME="Mac Address"
     UNIQUE_ID=$IDENTIFIERS"-mac_addr"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/sensor/$IDENTIFIERS/mac_addr/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:network","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_INFO_GLOBAL_TOPIC'","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.mac_addr }}", "platform": "mqtt"}'
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
     #Home Version
-    UNIQUE_NAME=$NAME" Home Version"
+    UNIQUE_NAME="Home Version"
     UNIQUE_ID=$IDENTIFIERS"-home_version"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/sensor/$IDENTIFIERS/home_version/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:memory","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_INFO_GLOBAL_TOPIC'","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.home_version }}", "platform": "mqtt"}'
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
     #Firmware Version
-    UNIQUE_NAME=$NAME" Firmware Version"
+    UNIQUE_NAME="Firmware Version"
     UNIQUE_ID=$IDENTIFIERS"-fw_version"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/sensor/$IDENTIFIERS/fw_version/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:network","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_INFO_GLOBAL_TOPIC'","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.fw_version }}", "platform": "mqtt"}'
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
     #Model Suffix
-    UNIQUE_NAME=$NAME" Model Suffix"
+    UNIQUE_NAME="Model Suffix"
     UNIQUE_ID=$IDENTIFIERS"-model_suffix"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/sensor/$IDENTIFIERS/model_suffix/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:network","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_INFO_GLOBAL_TOPIC'","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.model_suffix }}", "platform": "mqtt"}'
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
     #Serial Number
-    UNIQUE_NAME=$NAME" Serial Number"
+    UNIQUE_NAME="Serial Number"
     UNIQUE_ID=$IDENTIFIERS"-serial_number"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/sensor/$IDENTIFIERS/serial_number/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:webcam","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_INFO_GLOBAL_TOPIC'","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.serial_number }}", "platform": "mqtt"}'
@@ -175,37 +175,37 @@ if [ "$MQTT_ADV_TELEMETRY_ENABLE" == "yes" ]; then
         QOS=""
     fi
     #Total Memory
-    UNIQUE_NAME=$NAME" Total Memory"
+    UNIQUE_NAME="Total Memory"
     UNIQUE_ID=$IDENTIFIERS"-total_memory"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/sensor/$IDENTIFIERS/total_memory/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:memory","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_TELEMETRY_TOPIC'","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.total_memory }}","unit_of_measurement":"KB", "platform": "mqtt"}'
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
     #Free Memory
-    UNIQUE_NAME=$NAME" Free Memory"
+    UNIQUE_NAME="Free Memory"
     UNIQUE_ID=$IDENTIFIERS"-free_memory"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/sensor/$IDENTIFIERS/free_memory/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:memory","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_TELEMETRY_TOPIC'","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.free_memory }}","unit_of_measurement":"KB", "platform": "mqtt"}'
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
     #FreeSD
-    UNIQUE_NAME=$NAME" Free SD"
+    UNIQUE_NAME="Free SD"
     UNIQUE_ID=$IDENTIFIERS"-free_sd"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/sensor/$IDENTIFIERS/free_sd/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:micro-sd","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_TELEMETRY_TOPIC'","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.free_sd|regex_replace(find=\"%\", replace=\"\", ignorecase=False) }}","unit_of_measurement":"%", "platform": "mqtt"}'
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
     #Load AVG
-    UNIQUE_NAME=$NAME" Load AVG"
+    UNIQUE_NAME="Load AVG"
     UNIQUE_ID=$IDENTIFIERS"-load_avg"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/sensor/$IDENTIFIERS/load_avg/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:network","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_TELEMETRY_TOPIC'","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.load_avg }}", "platform": "mqtt"}'
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
     #Uptime
-    UNIQUE_NAME=$NAME" Uptime"
+    UNIQUE_NAME="Uptime"
     UNIQUE_ID=$IDENTIFIERS"-uptime"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/sensor/$IDENTIFIERS/uptime/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "device_class":"timestamp","icon":"mdi:timer-outline","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_TELEMETRY_TOPIC'","name":"'$UNIQUE_NAME'","'unique_id'":"'$UNIQUE_ID'","value_template":"{{ (as_timestamp(now())-(value_json.uptime|int))|timestamp_local }}", "platform": "mqtt"}'
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
     #WLanStrenght
-    UNIQUE_NAME=$NAME" Wlan Strengh"
+    UNIQUE_NAME="Wlan Strengh"
     UNIQUE_ID=$IDENTIFIERS"-wlan_strength"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/sensor/$IDENTIFIERS/wlan_strength/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "device_class":"signal_strength","icon":"mdi:wifi","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_TELEMETRY_TOPIC'","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ ((value_json.wlan_strength|int) * 100 / 70 )|int }}","unit_of_measurement":"%", "platform": "mqtt"}'
@@ -218,7 +218,7 @@ else
 fi
 
 # Motion Detection
-UNIQUE_NAME=$NAME" Movement"
+UNIQUE_NAME="Movement"
 UNIQUE_ID=$IDENTIFIERS"-motion_detection"
 TOPIC=$HOMEASSISTANT_MQTT_PREFIX/binary_sensor/$IDENTIFIERS/motion_detection/config
 MQTT_RETAIN_MOTION=$(get_config MQTT_RETAIN_MOTION)
@@ -231,7 +231,7 @@ MQTT_RETAIN_MOTION=$(get_config MQTT_RETAIN_MOTION)
 CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"}, "qos": "'$MQTT_QOS'", '$RETAIN' "device_class":"motion","state_topic":"'$MQTT_PREFIX'/'$TOPIC_MOTION'","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","payload_on":"'$MOTION_START_MSG'","payload_off":"'$MOTION_STOP_MSG'", "platform": "mqtt"}'
 $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
 # Human Detection
-UNIQUE_NAME=$NAME" Human Detection"
+UNIQUE_NAME="Human Detection"
 UNIQUE_ID=$IDENTIFIERS"-ai_human_detection"
 TOPIC=$HOMEASSISTANT_MQTT_PREFIX/binary_sensor/$IDENTIFIERS/ai_human_detection/config
 MQTT_RETAIN_AI_HUMAN_DETECTION=$(get_config MQTT_RETAIN_AI_HUMAN_DETECTION)
@@ -244,7 +244,7 @@ MQTT_RETAIN_AI_HUMAN_DETECTION=$(get_config MQTT_RETAIN_AI_HUMAN_DETECTION)
 CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"}, "qos": "'$MQTT_QOS'", '$RETAIN' "device_class":"motion","state_topic":"'$MQTT_PREFIX'/'$TOPIC_AI_HUMAN_DETECTION'","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","payload_on":"'$AI_HUMAN_DETECTION_MSG'","off_delay":60, "platform": "mqtt"}'
 $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
 # Sound Detection
-UNIQUE_NAME=$NAME" Sound Detection"
+UNIQUE_NAME="Sound Detection"
 UNIQUE_ID=$IDENTIFIERS"-sound_detection"
 TOPIC=$HOMEASSISTANT_MQTT_PREFIX/binary_sensor/$IDENTIFIERS/sound_detection/config
 MQTT_RETAIN_SOUND_DETECTION=$(get_config MQTT_RETAIN_SOUND_DETECTION)
@@ -260,7 +260,7 @@ $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $T
 TOPIC=$HOMEASSISTANT_MQTT_PREFIX/binary_sensor/$IDENTIFIERS/baby_crying/config
 $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME -h $HOST -t $TOPIC -m ""
 # Motion Detection Image
-UNIQUE_NAME=$NAME" Motion Detection Image"
+UNIQUE_NAME="Motion Detection Image"
 UNIQUE_ID=$IDENTIFIERS"-motion_detection_image"
 TOPIC=$HOMEASSISTANT_MQTT_PREFIX/camera/$IDENTIFIERS/motion_detection_image/config
 MQTT_RETAIN_MOTION_IMAGE=$(get_config MQTT_RETAIN_MOTION_IMAGE)
@@ -284,13 +284,13 @@ if [ "$MQTT_ADV_CAMERA_SETTING_ENABLE" == "yes" ]; then
         QOS=""
     fi
     # Switch On
-    UNIQUE_NAME=$NAME" Switch Status"
+    UNIQUE_NAME="Switch Status"
     UNIQUE_ID=$IDENTIFIERS"-SWITCH_ON"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/switch/$IDENTIFIERS/SWITCH_ON/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:video","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_CAMERA_SETTING_TOPIC'","command_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_CAMERA_SETTING_TOPIC'/SWITCH_ON/set","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.SWITCH_ON }}","payload_on":"yes","payload_off":"no", "platform": "mqtt"}'
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
     # Sound Detection
-    UNIQUE_NAME=$NAME" Sound Detection"
+    UNIQUE_NAME="Sound Detection"
     UNIQUE_ID=$IDENTIFIERS"-SOUND_DETECTION"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/switch/$IDENTIFIERS/SOUND_DETECTION/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"}, '$QOS' '$RETAIN' "icon":"mdi:music-note","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_CAMERA_SETTING_TOPIC'","command_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_CAMERA_SETTING_TOPIC'/SOUND_DETECTION/set","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.SOUND_DETECTION }}","payload_on":"yes","payload_off":"no", "platform": "mqtt"}'
@@ -299,19 +299,19 @@ if [ "$MQTT_ADV_CAMERA_SETTING_ENABLE" == "yes" ]; then
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/switch/$IDENTIFIERS/BABY_CRYING_DETECT/config
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME -h $HOST -t $TOPIC -n
     # Led
-    UNIQUE_NAME=$NAME" Status Led"
+    UNIQUE_NAME="Status Led"
     UNIQUE_ID=$IDENTIFIERS"-LED"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/switch/$IDENTIFIERS/LED/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:led-on","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_CAMERA_SETTING_TOPIC'","command_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_CAMERA_SETTING_TOPIC'/LED/set","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.LED }}","payload_on":"yes","payload_off":"no", "platform": "mqtt"}'
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
     # IR
-    UNIQUE_NAME=$NAME" IR Led"
+    UNIQUE_NAME="IR Led"
     UNIQUE_ID=$IDENTIFIERS"-IR"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/switch/$IDENTIFIERS/IR/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:remote","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_CAMERA_SETTING_TOPIC'","command_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_CAMERA_SETTING_TOPIC'/IR/set","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.IR }}","payload_on":"yes","payload_off":"no", "platform": "mqtt"}'
     $YI_HACK_PREFIX/bin/mosquitto_pub -i $HOSTNAME $HA_QOS $HA_RETAIN -h $HOST -t $TOPIC -m "$CONTENT"
     # Rotate
-    UNIQUE_NAME=$NAME"  Rotate"
+    UNIQUE_NAME=" Rotate"
     UNIQUE_ID=$IDENTIFIERS"-ROTATE"
     TOPIC=$HOMEASSISTANT_MQTT_PREFIX/switch/$IDENTIFIERS/ROTATE/config
     CONTENT='{"availability_topic":"'$MQTT_PREFIX'/'$TOPIC_BIRTH_WILL'","payload_available":"'$BIRTH_MSG'","payload_not_available":"'$WILL_MSG'","device":{"identifiers":["'$IDENTIFIERS'"],"manufacturer":"'$MANUFACTURER'","model":"'$MODEL'","name":"'$NAME'","sw_version":"'$SW_VERSION'"},'$QOS' '$RETAIN' "icon":"mdi:monitor","state_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_CAMERA_SETTING_TOPIC'","command_topic":"'$MQTT_PREFIX'/'$MQTT_ADV_CAMERA_SETTING_TOPIC'/ROTATE/set","name":"'$UNIQUE_NAME'","unique_id":"'$UNIQUE_ID'","value_template":"{{ value_json.ROTATE }}","payload_on":"yes","payload_off":"no", "platform": "mqtt"}'

From afb3f0ce7c37b64ec3582d4cc279bc8cf29091cd Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Sat, 27 Jan 2024 09:43:32 +0100
Subject: [PATCH 62/81] Update onvif_simple_server to the last commit

---
 src/onvif_simple_server/onvif_simple_server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/onvif_simple_server/onvif_simple_server b/src/onvif_simple_server/onvif_simple_server
index ae40434..2f49b9a 160000
--- a/src/onvif_simple_server/onvif_simple_server
+++ b/src/onvif_simple_server/onvif_simple_server
@@ -1 +1 @@
-Subproject commit ae40434ffbb67d3ecda9dfa02cf7abd1cd4b2a9b
+Subproject commit 2f49b9aa7cd99a6e95e5cad53b93554e278ada3c

From 29f8cdb25303e455a307070192b8a16e597b07e2 Mon Sep 17 00:00:00 2001
From: fidesachates <2189515+fidesachates@users.noreply.github.com>
Date: Sun, 28 Jan 2024 13:20:42 -0500
Subject: [PATCH 63/81] fix: sleep to give ipc_multiplexer time

---
 src/static/static/home/yi-hack-v5/script/system.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/static/home/yi-hack-v5/script/system.sh b/src/static/static/home/yi-hack-v5/script/system.sh
index 84ad7ab..f194fa0 100755
--- a/src/static/static/home/yi-hack-v5/script/system.sh
+++ b/src/static/static/home/yi-hack-v5/script/system.sh
@@ -227,7 +227,7 @@ fi
 
 ipc_multiplexer &
 
-mqttv4 &
+sleep 30 && mqttv4 &
 if [[ $(get_config MQTT) == "yes" ]] ; then
     mqtt-config &
     $YI_HACK_PREFIX/script/conf2mqtt.sh &

From dc188fb128ded296388cb5ac93b0d9fab2b73a4e Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Mon, 29 Jan 2024 00:02:11 +0000
Subject: [PATCH 64/81] [+] Busybox clearance, Curl fix, and wpa_supplicant
 integration  Changes to be committed: 	modified:   src/busybox/.config 
 modified:   src/curl/compile.curl 	modified:   src/curl/init.curl 
 modified:   src/wpa/install.wpa  To Do - roleo's changes and onvif fix +
 testing

---
 src/busybox/.config   | 104 +++++++++++++++++++++---------------------
 src/curl/compile.curl |  13 ++++--
 src/curl/init.curl    |   5 +-
 src/wpa/install.wpa   |   5 ++
 4 files changed, 68 insertions(+), 59 deletions(-)
 mode change 100644 => 100755 src/busybox/.config

diff --git a/src/busybox/.config b/src/busybox/.config
old mode 100644
new mode 100755
index 62c261c..e41bc92
--- a/src/busybox/.config
+++ b/src/busybox/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.36.1
-# Tue Jan 23 18:38:08 2024
+# Sun Jan 28 18:01:36 2024
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -47,7 +47,7 @@ CONFIG_FEATURE_SYSLOG=y
 # CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set
 # CONFIG_FEATURE_INDIVIDUAL is not set
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
-CONFIG_CROSS_COMPILER_PREFIX="arm-hisiv300-linux-uclibcgnueabi-"
+CONFIG_CROSS_COMPILER_PREFIX="arm-hisiv300-linux-"
 CONFIG_SYSROOT=""
 CONFIG_EXTRA_CFLAGS="-march=armv5te -mcpu=arm926ej-s"
 CONFIG_EXTRA_LDFLAGS=""
@@ -423,24 +423,24 @@ CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
 # CONFIG_ED is not set
 # CONFIG_PATCH is not set
 CONFIG_SED=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_MAX_LEN=4096
+# CONFIG_VI is not set
+CONFIG_FEATURE_VI_MAX_LEN=0
 # CONFIG_FEATURE_VI_8BIT is not set
-CONFIG_FEATURE_VI_COLON=y
+# CONFIG_FEATURE_VI_COLON is not set
 # CONFIG_FEATURE_VI_COLON_EXPAND is not set
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
+# CONFIG_FEATURE_VI_YANKMARK is not set
+# CONFIG_FEATURE_VI_SEARCH is not set
 # CONFIG_FEATURE_VI_REGEX_SEARCH is not set
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_UNDO=y
-CONFIG_FEATURE_VI_UNDO_QUEUE=y
-CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
+# CONFIG_FEATURE_VI_USE_SIGNALS is not set
+# CONFIG_FEATURE_VI_DOT_CMD is not set
+# CONFIG_FEATURE_VI_READONLY is not set
+# CONFIG_FEATURE_VI_SETOPTS is not set
+# CONFIG_FEATURE_VI_SET is not set
+# CONFIG_FEATURE_VI_WIN_RESIZE is not set
+# CONFIG_FEATURE_VI_ASK_TERMINAL is not set
+# CONFIG_FEATURE_VI_UNDO is not set
+# CONFIG_FEATURE_VI_UNDO_QUEUE is not set
+CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0
 # CONFIG_FEATURE_VI_VERBOSE_STATUS is not set
 CONFIG_FEATURE_ALLOW_EXEC=y
 
@@ -450,11 +450,11 @@ CONFIG_FEATURE_ALLOW_EXEC=y
 CONFIG_FIND=y
 CONFIG_FEATURE_FIND_PRINT0=y
 CONFIG_FEATURE_FIND_MTIME=y
-# CONFIG_FEATURE_FIND_ATIME is not set
-# CONFIG_FEATURE_FIND_CTIME is not set
+CONFIG_FEATURE_FIND_ATIME=y
+CONFIG_FEATURE_FIND_CTIME=y
 CONFIG_FEATURE_FIND_MMIN=y
-# CONFIG_FEATURE_FIND_AMIN is not set
-# CONFIG_FEATURE_FIND_CMIN is not set
+CONFIG_FEATURE_FIND_AMIN=y
+CONFIG_FEATURE_FIND_CMIN=y
 CONFIG_FEATURE_FIND_PERM=y
 CONFIG_FEATURE_FIND_TYPE=y
 CONFIG_FEATURE_FIND_EXECUTABLE=y
@@ -462,7 +462,7 @@ CONFIG_FEATURE_FIND_XDEV=y
 CONFIG_FEATURE_FIND_MAXDEPTH=y
 CONFIG_FEATURE_FIND_NEWER=y
 CONFIG_FEATURE_FIND_INUM=y
-# CONFIG_FEATURE_FIND_SAMEFILE is not set
+CONFIG_FEATURE_FIND_SAMEFILE=y
 CONFIG_FEATURE_FIND_EXEC=y
 CONFIG_FEATURE_FIND_EXEC_PLUS=y
 CONFIG_FEATURE_FIND_USER=y
@@ -474,7 +474,7 @@ CONFIG_FEATURE_FIND_SIZE=y
 CONFIG_FEATURE_FIND_PRUNE=y
 CONFIG_FEATURE_FIND_QUIT=y
 CONFIG_FEATURE_FIND_DELETE=y
-# CONFIG_FEATURE_FIND_EMPTY is not set
+CONFIG_FEATURE_FIND_EMPTY=y
 CONFIG_FEATURE_FIND_PATH=y
 CONFIG_FEATURE_FIND_REGEX=y
 # CONFIG_FEATURE_FIND_CONTEXT is not set
@@ -662,8 +662,8 @@ CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
 # CONFIG_MKFS_REISER is not set
 # CONFIG_MKDOSFS is not set
 # CONFIG_MKFS_VFAT is not set
-CONFIG_MKSWAP=y
-CONFIG_FEATURE_MKSWAP_UUID=y
+# CONFIG_MKSWAP is not set
+# CONFIG_FEATURE_MKSWAP_UUID is not set
 CONFIG_MORE=y
 CONFIG_MOUNT=y
 CONFIG_FEATURE_MOUNT_FAKE=y
@@ -696,7 +696,7 @@ CONFIG_FEATURE_SETPRIV_DUMP=y
 CONFIG_FEATURE_SETPRIV_CAPABILITIES=y
 CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES=y
 # CONFIG_SETSID is not set
-CONFIG_SWAPON=y
+# CONFIG_SWAPON is not set
 # CONFIG_FEATURE_SWAPON_DISCARD is not set
 # CONFIG_FEATURE_SWAPON_PRI is not set
 # CONFIG_SWAPOFF is not set
@@ -725,7 +725,7 @@ CONFIG_VOLUMEID=y
 # CONFIG_FEATURE_VOLUMEID_BCACHE is not set
 CONFIG_FEATURE_VOLUMEID_BTRFS=y
 CONFIG_FEATURE_VOLUMEID_CRAMFS=y
-# CONFIG_FEATURE_VOLUMEID_EROFS is not set
+CONFIG_FEATURE_VOLUMEID_EROFS=y
 CONFIG_FEATURE_VOLUMEID_EXFAT=y
 CONFIG_FEATURE_VOLUMEID_EXT=y
 # CONFIG_FEATURE_VOLUMEID_F2FS is not set
@@ -753,7 +753,7 @@ CONFIG_FEATURE_VOLUMEID_XFS=y
 # Miscellaneous Utilities
 #
 # CONFIG_ADJTIMEX is not set
-# CONFIG_ASCII is not set
+CONFIG_ASCII=y
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
 CONFIG_BC=y
@@ -774,12 +774,12 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0
 # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
 # CONFIG_FEATURE_CHAT_CLR_ABORT is not set
 # CONFIG_CONSPY is not set
-CONFIG_CROND=y
+# CONFIG_CROND is not set
 # CONFIG_FEATURE_CROND_D is not set
 # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
 # CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set
 CONFIG_FEATURE_CROND_DIR=""
-CONFIG_CRONTAB=y
+# CONFIG_CRONTAB is not set
 # CONFIG_DEVFSD is not set
 # CONFIG_DEVFSD_MODLOAD is not set
 # CONFIG_DEVFSD_FG_NP is not set
@@ -791,13 +791,13 @@ CONFIG_FLASH_ERASEALL=y
 # CONFIG_FLASH_LOCK is not set
 # CONFIG_FLASH_UNLOCK is not set
 CONFIG_FLASHCP=y
-CONFIG_HDPARM=y
-CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
-CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
-CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y
+# CONFIG_HDPARM is not set
+# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
 # CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
 # CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
 CONFIG_HEXEDIT=y
 # CONFIG_I2CGET is not set
 # CONFIG_I2CSET is not set
@@ -875,13 +875,13 @@ CONFIG_FTPD=y
 CONFIG_FEATURE_FTPD_WRITE=y
 CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
 CONFIG_FEATURE_FTPD_AUTHENTICATION=y
-CONFIG_FTPGET=y
-CONFIG_FTPPUT=y
-CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
 CONFIG_HOSTNAME=y
 # CONFIG_DNSDOMAINNAME is not set
 CONFIG_HTTPD=y
-CONFIG_FEATURE_HTTPD_PORT_DEFAULT=8080
+CONFIG_FEATURE_HTTPD_PORT_DEFAULT=80
 CONFIG_FEATURE_HTTPD_RANGES=y
 # CONFIG_FEATURE_HTTPD_SETUID is not set
 CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
@@ -894,8 +894,8 @@ CONFIG_FEATURE_HTTPD_CGI=y
 # CONFIG_FEATURE_HTTPD_PROXY is not set
 CONFIG_FEATURE_HTTPD_GZIP=y
 # CONFIG_FEATURE_HTTPD_ETAG is not set
-# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set
-# CONFIG_FEATURE_HTTPD_DATE is not set
+CONFIG_FEATURE_HTTPD_LAST_MODIFIED=y
+CONFIG_FEATURE_HTTPD_DATE=y
 # CONFIG_FEATURE_HTTPD_ACL_IP is not set
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
@@ -984,7 +984,7 @@ CONFIG_FEATURE_TELNETD_INETD_WAIT=y
 # CONFIG_FEATURE_TFTP_PUT is not set
 # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
 # CONFIG_TFTP_DEBUG is not set
-CONFIG_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_TRACEROUTE is not set
 # CONFIG_TRACEROUTE6 is not set
 # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
@@ -992,14 +992,14 @@ CONFIG_TLS=y
 # CONFIG_TUNCTL is not set
 # CONFIG_FEATURE_TUNCTL_UG is not set
 # CONFIG_VCONFIG is not set
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_FTP=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_TIMEOUT=y
-CONFIG_FEATURE_WGET_HTTPS=y
-CONFIG_FEATURE_WGET_OPENSSL=y
+# CONFIG_WGET is not set
+# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
+# CONFIG_FEATURE_WGET_STATUSBAR is not set
+# CONFIG_FEATURE_WGET_FTP is not set
+# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
+# CONFIG_FEATURE_WGET_TIMEOUT is not set
+# CONFIG_FEATURE_WGET_HTTPS is not set
+# CONFIG_FEATURE_WGET_OPENSSL is not set
 # CONFIG_WHOIS is not set
 # CONFIG_ZCIP is not set
 # CONFIG_UDHCPD is not set
@@ -1040,13 +1040,13 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
 #
 # Mail Utilities
 #
-CONFIG_FEATURE_MIME_CHARSET="us-ascii"
+CONFIG_FEATURE_MIME_CHARSET=""
 # CONFIG_MAKEMIME is not set
 # CONFIG_POPMAILDIR is not set
 # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
 # CONFIG_REFORMIME is not set
 # CONFIG_FEATURE_REFORMIME_COMPAT is not set
-CONFIG_SENDMAIL=y
+# CONFIG_SENDMAIL is not set
 
 #
 # Process Utilities
diff --git a/src/curl/compile.curl b/src/curl/compile.curl
index d82dab8..4fd3103 100755
--- a/src/curl/compile.curl
+++ b/src/curl/compile.curl
@@ -1,16 +1,19 @@
 #!/bin/bash
 
 SCRIPT_DIR=$(cd `dirname $0` && pwd)
+PREFIX=$(pwd)/sysroot
 cd $SCRIPT_DIR
 
 cd curl || exit 1
 
 ./buildconf || exit 1
 
-./configure --host=arm-hisiv300-linux --without-ssl --disable-shared --disable-libcurl-option \
-    --prefix=$SCRIPT_DIR/_install \
-   DESTDIR="$SCRIPT_DIR/_install/" && make install-strip \
-   install \
-   || exit 1
+./configure --with-openssl=${PREFIX} --host=arm-hisiv300-linux-uclibcgnueabi --prefix=$SCRIPT_DIR/_install --disable-shared DESTDIR="$SCRIPT_DIR/_install/" && make install-strip install || exit 1
+
+#./configure --host=arm-hisiv300-linux --with-openssl --disable-shared --disable-libcurl-option \
+#    --prefix=$SCRIPT_DIR/_install \
+#   DESTDIR="$SCRIPT_DIR/_install/" && make install-strip \
+#   install \
+#   || exit 1
 
 
diff --git a/src/curl/init.curl b/src/curl/init.curl
index 87b8ff7..3360284 100755
--- a/src/curl/init.curl
+++ b/src/curl/init.curl
@@ -13,7 +13,8 @@ rm -rf ./openssl*
 wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz
 tar zxf openssl-1.1.1w.tar.gz
 pushd openssl-1.1.1w
-./Configure linux-generic32 shared -DL_ENDIAN --prefix=${PREFIX} --openssldir=${PREFIX} shared
+./Configure linux-generic32 no-async -DL_ENDIAN --prefix=${PREFIX} --openssldir=${PREFIX} shared
 make CROSS_COMPILE=arm-hisiv300-linux- LD=arm-hisiv300-linux-ld AR=arm-hisiv300-linux-ar NM=arm-hisiv300-linux-nm AS=arm-hisiv300-linux-as install
-
 popd
+
+
diff --git a/src/wpa/install.wpa b/src/wpa/install.wpa
index b74ebde..aececfa 100755
--- a/src/wpa/install.wpa
+++ b/src/wpa/install.wpa
@@ -7,6 +7,11 @@ cd $SCRIPT_DIR
 #upx ./_install/sbin/curl
 
 mkdir -p ../../build/home/yi-hack-v5/wpa/
+mkdir -p ../../build/home/base/tools/
+mkdir -p ../../build/home/lib/
 
 rsync -r ./_install/usr/local/sbin/ ../../build/home/yi-hack-v5/wpa/
 cp sysroot/lib/libcrypto.so.1.1 ../../build/home/yi-hack-v5/wpa/
+
+rsync -r ./_install/usr/local/sbin/ ../../build/home/tools/
+cp sysroot/lib/libcrypto.so.1.1 ../../build/home/lib/

From e17aee7d46b23dec99a1b1ed308c86c61d2323c2 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Mon, 29 Jan 2024 00:21:59 +0000
Subject: [PATCH 65/81] [~] Fix wpa_supplicant path & baseline pack  Changes to
 be committed: 	modified:   scripts/pack_fw.sh 	modified:  
 src/wpa/install.wpa

---
 scripts/pack_fw.sh  | 4 ++--
 src/wpa/install.wpa | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/pack_fw.sh b/scripts/pack_fw.sh
index 6b25b43..85f0654 100755
--- a/scripts/pack_fw.sh
+++ b/scripts/pack_fw.sh
@@ -230,11 +230,11 @@ printf "done!\n\n"
 
 # home
 # Disabled after 0.3.8
-#pack_image "home" $CAMERA_ID $TMP_DIR $OUT_DIR
+pack_image "home" $CAMERA_ID $TMP_DIR $OUT_DIR
 
 # rootfs
 # Disabled after 0.3.8
-#pack_image "rootfs" $CAMERA_ID $TMP_DIR $OUT_DIR
+pack_image "rootfs" $CAMERA_ID $TMP_DIR $OUT_DIR
 
 # pack files for release
 pack_files $WORK_DIR $CAMERA_NAME $VERSION_ID
diff --git a/src/wpa/install.wpa b/src/wpa/install.wpa
index aececfa..c53b786 100755
--- a/src/wpa/install.wpa
+++ b/src/wpa/install.wpa
@@ -13,5 +13,5 @@ mkdir -p ../../build/home/lib/
 rsync -r ./_install/usr/local/sbin/ ../../build/home/yi-hack-v5/wpa/
 cp sysroot/lib/libcrypto.so.1.1 ../../build/home/yi-hack-v5/wpa/
 
-rsync -r ./_install/usr/local/sbin/ ../../build/home/tools/
+rsync -r ./_install/usr/local/sbin/ ../../build/home/base/tools/
 cp sysroot/lib/libcrypto.so.1.1 ../../build/home/lib/

From 40b9ace33ef59c2cd89d58268c5bd208c079ce84 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Wed, 31 Jan 2024 12:10:45 +0100
Subject: [PATCH 66/81] Enable packing of rootfs and home

---
 scripts/pack_fw.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/pack_fw.sh b/scripts/pack_fw.sh
index 6b25b43..85f0654 100755
--- a/scripts/pack_fw.sh
+++ b/scripts/pack_fw.sh
@@ -230,11 +230,11 @@ printf "done!\n\n"
 
 # home
 # Disabled after 0.3.8
-#pack_image "home" $CAMERA_ID $TMP_DIR $OUT_DIR
+pack_image "home" $CAMERA_ID $TMP_DIR $OUT_DIR
 
 # rootfs
 # Disabled after 0.3.8
-#pack_image "rootfs" $CAMERA_ID $TMP_DIR $OUT_DIR
+pack_image "rootfs" $CAMERA_ID $TMP_DIR $OUT_DIR
 
 # pack files for release
 pack_files $WORK_DIR $CAMERA_NAME $VERSION_ID

From b96d835464ad69b993924b1a47816352b1229084 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Wed, 31 Jan 2024 12:14:38 +0100
Subject: [PATCH 67/81] Remove busybox submodule

---
 .gitmodules         | 4 ----
 src/busybox/busybox | 1 -
 2 files changed, 5 deletions(-)
 delete mode 160000 src/busybox/busybox

diff --git a/.gitmodules b/.gitmodules
index 4c1bd58..877efd4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,10 +6,6 @@
 	path = src/uClibc/uClibc
 	url = https://github.com/kraj/uClibc.git
 	ignore = dirty
-[submodule "src/busybox/busybox"]
-	path = src/busybox/busybox
-	url = https://github.com/mirror/busybox.git
-	ignore = dirty
 [submodule "src/proxychains-ng/proxychains-ng"]
 	path = src/proxychains-ng/proxychains-ng
 	url = https://github.com/rofl0r/proxychains-ng.git
diff --git a/src/busybox/busybox b/src/busybox/busybox
deleted file mode 160000
index bd75474..0000000
--- a/src/busybox/busybox
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bd754746394a382e04d116df02547f61b2026da9

From 4ae48dfd934d5f8cc408893c615eb18250470649 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Wed, 31 Jan 2024 12:17:13 +0100
Subject: [PATCH 68/81] Add busybox 1.36.1

---
 src/busybox/.config         | 118 ++++++++++++++++++++++++------------
 src/busybox/auth.patch      |  18 ++++++
 src/busybox/compile.busybox |   5 +-
 src/busybox/config.busybox  |   7 +++
 src/busybox/gzdef.patch     |  53 ++++++++++++++++
 src/busybox/init.busybox    |  13 +++-
 src/busybox/onvif.patch     |   8 +--
 7 files changed, 175 insertions(+), 47 deletions(-)
 create mode 100644 src/busybox/auth.patch
 create mode 100644 src/busybox/config.busybox
 create mode 100644 src/busybox/gzdef.patch

diff --git a/src/busybox/.config b/src/busybox/.config
index dbf9c0a..9643fb4 100644
--- a/src/busybox/.config
+++ b/src/busybox/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.31.1
-# Thu Apr 29 20:02:02 2021
+# Busybox version: 1.36.1
+# Tue Jan 30 21:11:49 2024
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -36,7 +36,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 # CONFIG_FEATURE_CLEAN_UP is not set
 CONFIG_FEATURE_SYSLOG_INFO=y
 CONFIG_FEATURE_SYSLOG=y
-CONFIG_PLATFORM_LINUX=y
 
 #
 # Build Options
@@ -55,6 +54,7 @@ CONFIG_EXTRA_LDFLAGS=""
 CONFIG_EXTRA_LDLIBS=""
 # CONFIG_USE_PORTABLE_CODE is not set
 # CONFIG_STACK_OPTIMIZATION_386 is not set
+# CONFIG_STATIC_LIBGCC is not set
 
 #
 # Installation Options ("make install" behavior)
@@ -76,6 +76,7 @@ CONFIG_PREFIX="../_install"
 # CONFIG_DEBUG_SANITIZE is not set
 # CONFIG_UNIT_TEST is not set
 # CONFIG_WERROR is not set
+# CONFIG_WARN_SIMPLE_MSG is not set
 CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
@@ -92,10 +93,16 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=1
+CONFIG_SHA1_SMALL=3
+CONFIG_SHA1_HWACCEL=y
+CONFIG_SHA256_HWACCEL=y
 CONFIG_SHA3_SMALL=1
-CONFIG_FEATURE_FAST_TOP=y
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-# CONFIG_FEATURE_ETC_SERVICES is not set
+CONFIG_FEATURE_NON_POSIX_CP=y
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_USE_SENDFILE=y
+CONFIG_FEATURE_COPYBUF_KB=4
+# CONFIG_MONOTONIC_SYSCALL is not set
+CONFIG_IOCTL_HEX2STR_ERROR=y
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
@@ -119,14 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
 # CONFIG_UNICODE_BIDI_SUPPORT is not set
 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
 # CONFIG_UNICODE_PRESERVE_BROKEN is not set
-CONFIG_FEATURE_NON_POSIX_CP=y
-# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
-CONFIG_FEATURE_USE_SENDFILE=y
-CONFIG_FEATURE_COPYBUF_KB=4
-CONFIG_FEATURE_SKIP_ROOTFS=y
-# CONFIG_MONOTONIC_SYSCALL is not set
-CONFIG_IOCTL_HEX2STR_ERROR=y
-CONFIG_FEATURE_HWIB=y
+# CONFIG_LOOP_CONFIGURE is not set
+# CONFIG_NO_LOOP_CONFIGURE is not set
+CONFIG_TRY_LOOP_CONFIGURE=y
 
 #
 # Applets
@@ -161,6 +163,8 @@ CONFIG_FEATURE_BZIP2_DECOMPRESS=y
 # CONFIG_CPIO is not set
 # CONFIG_FEATURE_CPIO_O is not set
 # CONFIG_FEATURE_CPIO_P is not set
+# CONFIG_FEATURE_CPIO_IGNORE_DEVNO is not set
+# CONFIG_FEATURE_CPIO_RENUMBER_INODES is not set
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 CONFIG_GZIP=y
@@ -196,6 +200,22 @@ CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
 #
 # Coreutils
 #
+CONFIG_FEATURE_VERBOSE=y
+
+#
+# Common options for date and touch
+#
+CONFIG_FEATURE_TIMEZONE=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
 CONFIG_BASENAME=y
 CONFIG_CAT=y
 CONFIG_FEATURE_CATN=y
@@ -206,11 +226,13 @@ CONFIG_CHOWN=y
 CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
 # CONFIG_CHROOT is not set
 # CONFIG_CKSUM is not set
+# CONFIG_CRC32 is not set
 # CONFIG_COMM is not set
 CONFIG_CP=y
 CONFIG_FEATURE_CP_LONG_OPTIONS=y
 CONFIG_FEATURE_CP_REFLINK=y
 CONFIG_CUT=y
+CONFIG_FEATURE_CUT_REGEX=y
 CONFIG_DATE=y
 CONFIG_FEATURE_DATE_ISOFMT=y
 # CONFIG_FEATURE_DATE_NANO is not set
@@ -222,6 +244,7 @@ CONFIG_FEATURE_DD_IBS_OBS=y
 CONFIG_FEATURE_DD_STATUS=y
 CONFIG_DF=y
 CONFIG_FEATURE_DF_FANCY=y
+CONFIG_FEATURE_SKIP_ROOTFS=y
 CONFIG_DIRNAME=y
 # CONFIG_DOS2UNIX is not set
 # CONFIG_UNIX2DOS is not set
@@ -315,13 +338,13 @@ CONFIG_TEST2=y
 # CONFIG_FEATURE_TEST_64 is not set
 # CONFIG_TIMEOUT is not set
 CONFIG_TOUCH=y
-# CONFIG_FEATURE_TOUCH_NODEREF is not set
 # CONFIG_FEATURE_TOUCH_SUSV3 is not set
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
 # CONFIG_TRUE is not set
 # CONFIG_TRUNCATE is not set
+# CONFIG_TSORT is not set
 # CONFIG_TTY is not set
 # CONFIG_UNAME is not set
 CONFIG_UNAME_OSNAME=""
@@ -330,31 +353,17 @@ CONFIG_BB_ARCH=y
 # CONFIG_UNLINK is not set
 CONFIG_USLEEP=y
 # CONFIG_UUDECODE is not set
+# CONFIG_BASE32 is not set
 CONFIG_BASE64=y
 # CONFIG_UUENCODE is not set
 # CONFIG_WC is not set
 # CONFIG_FEATURE_WC_LARGE is not set
-# CONFIG_WHOAMI is not set
 # CONFIG_WHO is not set
 # CONFIG_W is not set
 # CONFIG_USERS is not set
+# CONFIG_WHOAMI is not set
 # CONFIG_YES is not set
 
-#
-# Common options
-#
-CONFIG_FEATURE_VERBOSE=y
-
-#
-# Common options for cp and mv
-#
-CONFIG_FEATURE_PRESERVE_HARDLINKS=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
 #
 # Console Utilities
 #
@@ -418,6 +427,7 @@ CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=4096
 # CONFIG_FEATURE_VI_8BIT is not set
 CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_COLON_EXPAND=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
 # CONFIG_FEATURE_VI_REGEX_SEARCH is not set
@@ -431,6 +441,7 @@ CONFIG_FEATURE_VI_ASK_TERMINAL=y
 CONFIG_FEATURE_VI_UNDO=y
 CONFIG_FEATURE_VI_UNDO_QUEUE=y
 CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
+CONFIG_FEATURE_VI_VERBOSE_STATUS=y
 CONFIG_FEATURE_ALLOW_EXEC=y
 
 #
@@ -439,7 +450,11 @@ CONFIG_FEATURE_ALLOW_EXEC=y
 CONFIG_FIND=y
 CONFIG_FEATURE_FIND_PRINT0=y
 CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_ATIME=y
+CONFIG_FEATURE_FIND_CTIME=y
 CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_AMIN=y
+CONFIG_FEATURE_FIND_CMIN=y
 CONFIG_FEATURE_FIND_PERM=y
 CONFIG_FEATURE_FIND_TYPE=y
 CONFIG_FEATURE_FIND_EXECUTABLE=y
@@ -447,6 +462,7 @@ CONFIG_FEATURE_FIND_XDEV=y
 CONFIG_FEATURE_FIND_MAXDEPTH=y
 CONFIG_FEATURE_FIND_NEWER=y
 CONFIG_FEATURE_FIND_INUM=y
+CONFIG_FEATURE_FIND_SAMEFILE=y
 CONFIG_FEATURE_FIND_EXEC=y
 CONFIG_FEATURE_FIND_EXEC_PLUS=y
 CONFIG_FEATURE_FIND_USER=y
@@ -458,6 +474,7 @@ CONFIG_FEATURE_FIND_SIZE=y
 CONFIG_FEATURE_FIND_PRUNE=y
 CONFIG_FEATURE_FIND_QUIT=y
 CONFIG_FEATURE_FIND_DELETE=y
+CONFIG_FEATURE_FIND_EMPTY=y
 CONFIG_FEATURE_FIND_PATH=y
 CONFIG_FEATURE_FIND_REGEX=y
 # CONFIG_FEATURE_FIND_CONTEXT is not set
@@ -507,10 +524,10 @@ CONFIG_USE_BB_PWD_GRP=y
 CONFIG_USE_BB_SHADOW=y
 CONFIG_USE_BB_CRYPT=y
 CONFIG_USE_BB_CRYPT_SHA=y
-CONFIG_ADDGROUP=y
-CONFIG_FEATURE_ADDUSER_TO_GROUP=y
 CONFIG_ADD_SHELL=y
 CONFIG_REMOVE_SHELL=y
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
 CONFIG_ADDUSER=y
 # CONFIG_FEATURE_CHECK_NAMES is not set
 CONFIG_LAST_ID=60000
@@ -617,7 +634,6 @@ CONFIG_FLOCK=y
 # CONFIG_GETOPT is not set
 # CONFIG_FEATURE_GETOPT_LONG is not set
 CONFIG_HEXDUMP=y
-CONFIG_FEATURE_HEXDUMP_REVERSE=y
 CONFIG_HD=y
 # CONFIG_XXD is not set
 # CONFIG_HWCLOCK is not set
@@ -688,6 +704,7 @@ CONFIG_SWAPON=y
 # CONFIG_SWITCH_ROOT is not set
 # CONFIG_TASKSET is not set
 # CONFIG_FEATURE_TASKSET_FANCY is not set
+# CONFIG_FEATURE_TASKSET_CPULIST is not set
 # CONFIG_UEVENT is not set
 CONFIG_UMOUNT=y
 CONFIG_FEATURE_UMOUNT_ALL=y
@@ -708,6 +725,7 @@ CONFIG_VOLUMEID=y
 # CONFIG_FEATURE_VOLUMEID_BCACHE is not set
 CONFIG_FEATURE_VOLUMEID_BTRFS=y
 CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_EROFS=y
 CONFIG_FEATURE_VOLUMEID_EXFAT=y
 CONFIG_FEATURE_VOLUMEID_EXT=y
 # CONFIG_FEATURE_VOLUMEID_F2FS is not set
@@ -735,6 +753,7 @@ CONFIG_FEATURE_VOLUMEID_XFS=y
 # Miscellaneous Utilities
 #
 # CONFIG_ADJTIMEX is not set
+CONFIG_ASCII=y
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
 CONFIG_BC=y
@@ -768,10 +787,10 @@ CONFIG_CRONTAB=y
 # CONFIG_FEATURE_DEVFS is not set
 # CONFIG_DEVMEM is not set
 # CONFIG_FBSPLASH is not set
-CONFIG_FLASHCP=y
 CONFIG_FLASH_ERASEALL=y
 # CONFIG_FLASH_LOCK is not set
 # CONFIG_FLASH_UNLOCK is not set
+CONFIG_FLASHCP=y
 CONFIG_HDPARM=y
 CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
 CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
@@ -805,6 +824,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
 # CONFIG_MAN is not set
 # CONFIG_MICROCOM is not set
+# CONFIG_MIM is not set
 # CONFIG_MT is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
@@ -814,21 +834,24 @@ CONFIG_FEATURE_LESS_MAXLINES=0
 # CONFIG_RFKILL is not set
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
+# CONFIG_SEEDRNG is not set
 CONFIG_SETFATTR=y
 # CONFIG_SETSERIAL is not set
 # CONFIG_STRINGS is not set
 # CONFIG_TIME is not set
+# CONFIG_TREE is not set
 CONFIG_TS=y
 # CONFIG_TTYSIZE is not set
-# CONFIG_UBIRENAME is not set
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
 # CONFIG_UBIMKVOL is not set
 # CONFIG_UBIRMVOL is not set
 # CONFIG_UBIRSVOL is not set
 # CONFIG_UBIUPDATEVOL is not set
+# CONFIG_UBIRENAME is not set
 # CONFIG_VOLNAME is not set
 # CONFIG_WATCHDOG is not set
+# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set
 
 #
 # Networking Utilities
@@ -837,6 +860,9 @@ CONFIG_FEATURE_IPV6=y
 # CONFIG_FEATURE_UNIX_LOCAL is not set
 CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
 # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+# CONFIG_FEATURE_ETC_SERVICES is not set
+CONFIG_FEATURE_HWIB=y
 # CONFIG_FEATURE_TLS_SHA1 is not set
 CONFIG_ARP=y
 CONFIG_ARPING=y
@@ -855,6 +881,7 @@ CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
 CONFIG_HOSTNAME=y
 # CONFIG_DNSDOMAINNAME is not set
 CONFIG_HTTPD=y
+CONFIG_FEATURE_HTTPD_PORT_DEFAULT=80
 CONFIG_FEATURE_HTTPD_RANGES=y
 # CONFIG_FEATURE_HTTPD_SETUID is not set
 CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
@@ -866,6 +893,10 @@ CONFIG_FEATURE_HTTPD_CGI=y
 # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
 # CONFIG_FEATURE_HTTPD_PROXY is not set
 CONFIG_FEATURE_HTTPD_GZIP=y
+CONFIG_FEATURE_HTTPD_ETAG=y
+CONFIG_FEATURE_HTTPD_LAST_MODIFIED=y
+CONFIG_FEATURE_HTTPD_DATE=y
+CONFIG_FEATURE_HTTPD_ACL_IP=y
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
 CONFIG_FEATURE_IFCONFIG_SLIP=y
@@ -943,6 +974,7 @@ CONFIG_TCPSVD=y
 # CONFIG_FEATURE_TELNET_WIDTH is not set
 CONFIG_TELNETD=y
 CONFIG_FEATURE_TELNETD_STANDALONE=y
+CONFIG_FEATURE_TELNETD_PORT_DEFAULT=23
 CONFIG_FEATURE_TELNETD_INETD_WAIT=y
 # CONFIG_TFTP is not set
 # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
@@ -963,6 +995,7 @@ CONFIG_TLS=y
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_FTP=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 CONFIG_FEATURE_WGET_TIMEOUT=y
 CONFIG_FEATURE_WGET_HTTPS=y
@@ -979,6 +1012,7 @@ CONFIG_UDHCPC=y
 CONFIG_FEATURE_UDHCPC_ARPING=y
 CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
 CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC6_DEFAULT_SCRIPT=""
 # CONFIG_UDHCPC6 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
@@ -988,6 +1022,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 #
 # Common options for DHCP applets
 #
+CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0"
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=9
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
@@ -1005,17 +1040,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
 #
 # Mail Utilities
 #
+CONFIG_FEATURE_MIME_CHARSET="us-ascii"
 # CONFIG_MAKEMIME is not set
 # CONFIG_POPMAILDIR is not set
 # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
 # CONFIG_REFORMIME is not set
 # CONFIG_FEATURE_REFORMIME_COMPAT is not set
 CONFIG_SENDMAIL=y
-CONFIG_FEATURE_MIME_CHARSET="us-ascii"
 
 #
 # Process Utilities
 #
+CONFIG_FEATURE_FAST_TOP=y
+CONFIG_FEATURE_SHOW_THREADS=y
 CONFIG_FREE=y
 # CONFIG_FUSER is not set
 CONFIG_IOSTAT=y
@@ -1054,7 +1091,6 @@ CONFIG_FEATURE_TOPMEM=y
 CONFIG_UPTIME=y
 # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
 # CONFIG_WATCH is not set
-CONFIG_FEATURE_SHOW_THREADS=y
 
 #
 # Runit Utilities
@@ -1095,6 +1131,7 @@ CONFIG_SH_IS_ASH=y
 # CONFIG_BASH_IS_ASH is not set
 # CONFIG_BASH_IS_HUSH is not set
 CONFIG_BASH_IS_NONE=y
+CONFIG_SHELL_ASH=y
 CONFIG_ASH=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 CONFIG_ASH_INTERNAL_GLOB=y
@@ -1110,15 +1147,17 @@ CONFIG_ASH_EXPAND_PRMT=y
 CONFIG_ASH_ECHO=y
 CONFIG_ASH_PRINTF=y
 CONFIG_ASH_TEST=y
+CONFIG_ASH_SLEEP=y
 CONFIG_ASH_HELP=y
 CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_CMDCMD=y
 CONFIG_CTTYHACK=y
 # CONFIG_HUSH is not set
+# CONFIG_SHELL_HUSH is not set
 # CONFIG_HUSH_BASH_COMPAT is not set
 # CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_LINENO_VAR is not set
 # CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
+# CONFIG_HUSH_LINENO_VAR is not set
 # CONFIG_HUSH_INTERACTIVE is not set
 # CONFIG_HUSH_SAVEHISTORY is not set
 # CONFIG_HUSH_JOB is not set
@@ -1177,6 +1216,7 @@ CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y
 # CONFIG_FEATURE_REMOTE_LOG is not set
 # CONFIG_FEATURE_SYSLOGD_DUP is not set
 # CONFIG_FEATURE_SYSLOGD_CFG is not set
+# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
 # CONFIG_FEATURE_IPC_SYSLOG is not set
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
diff --git a/src/busybox/auth.patch b/src/busybox/auth.patch
new file mode 100644
index 0000000..b30dc3d
--- /dev/null
+++ b/src/busybox/auth.patch
@@ -0,0 +1,18 @@
+diff -Naur busybox-1.36.1.ori/networking/httpd.c busybox-1.36.1/networking/httpd.c
+--- busybox-1.36.1.ori/networking/httpd.c	2024-01-08 16:52:14.701167800 +0100
++++ busybox-1.36.1/networking/httpd.c	2024-01-08 16:53:21.413344344 +0100
+@@ -2136,8 +2136,12 @@
+ 			goto end_check_passwd;
+ 		}
+  bad_input:
+-		/* Comparing plaintext "user:pass" in one go */
+-		r = strcmp(cur->after_colon, user_and_passwd);
++		/* Check if auth is disabled for this path */
++		r = strcmp(cur->after_colon, ":");
++		if (r != 0) {
++			/* Comparing plaintext "user:pass" in one go */
++			r = strcmp(cur->after_colon, user_and_passwd);
++		}
+  end_check_passwd:
+ 		if (r == 0) {
+ 			remoteuser = xstrndup(user_and_passwd,
diff --git a/src/busybox/compile.busybox b/src/busybox/compile.busybox
index 6cd2340..807beaa 100755
--- a/src/busybox/compile.busybox
+++ b/src/busybox/compile.busybox
@@ -3,8 +3,9 @@
 SCRIPT_DIR=$(cd `dirname $0` && pwd)
 cd $SCRIPT_DIR
 
-cd busybox
+source config.busybox
+
+cd "${BUILD_FOLDER}"
 
 make -j$(nproc) ARCH=arm || exit 1
 make install || exit 1
-
diff --git a/src/busybox/config.busybox b/src/busybox/config.busybox
new file mode 100644
index 0000000..d7d3d88
--- /dev/null
+++ b/src/busybox/config.busybox
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+VERSION="1.36.1"
+MAIN_URL=https://busybox.net/downloads/busybox-${VERSION}.tar.bz2
+PACKAGE="busybox-${VERSION}"
+ARCHIVE="${PACKAGE}.tar.bz2"
+BUILD_FOLDER="busybox-${VERSION}"
diff --git a/src/busybox/gzdef.patch b/src/busybox/gzdef.patch
new file mode 100644
index 0000000..b3a083f
--- /dev/null
+++ b/src/busybox/gzdef.patch
@@ -0,0 +1,53 @@
+diff -Naur busybox-1.36.1.ori/networking/httpd.c busybox-1.36.1/networking/httpd.c
+--- busybox-1.36.1.ori/networking/httpd.c	2023-01-03 15:14:43.000000000 +0100
++++ busybox-1.36.1/networking/httpd.c	2024-01-08 16:45:49.504118695 +0100
+@@ -2182,7 +2182,7 @@
+ 	struct stat sb;
+ 	char *urlcopy;
+ 	char *urlp;
+-	char *tptr;
++	char *tptr, *gztptr;
+ #if ENABLE_FEATURE_HTTPD_ACL_IP
+ 	unsigned remote_ip;
+ #endif
+@@ -2418,7 +2418,32 @@
+ 			g_query = xstrdup(g_query); /* ok for NULL too */
+ 		strcpy(urlp, index_page);
+ 	}
++	gztptr = xasprintf("%s.gz", tptr);
+ 	if (stat(tptr, &sb) == 0) {
++		free(gztptr);
++		/* If URL is a directory with no slash, set up
++		 * "HTTP/1.1 302 Found" "Location: /dir/" reply */
++		if (urlp[-1] != '/' && S_ISDIR(sb.st_mode)) {
++			found_moved_temporarily = urlcopy;
++		} else {
++#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
++			char *suffix = strrchr(tptr, '.');
++			if (suffix) {
++				Htaccess *cur;
++				for (cur = script_i; cur; cur = cur->next) {
++					if (strcmp(cur->before_colon + 1, suffix) == 0) {
++						cgi_type = CGI_INTERPRETER;
++						break;
++					}
++				}
++			}
++#endif
++			file_size = sb.st_size;
++			last_mod = sb.st_mtime;
++		}
++	}
++	else if (stat(gztptr, &sb) == 0) {
++		free(gztptr);
+ 		/* If URL is a directory with no slash, set up
+ 		 * "HTTP/1.1 302 Found" "Location: /dir/" reply */
+ 		if (urlp[-1] != '/' && S_ISDIR(sb.st_mode)) {
+@@ -2442,6 +2467,7 @@
+ 	}
+ #if ENABLE_FEATURE_HTTPD_CGI
+ 	else if (urlp[-1] == '/') {
++		free(gztptr);
+ 		/* It's a dir URL and there is no index.html */
+ 		/* Is there cgi-bin/index.cgi? */
+ 		if (access("/cgi-bin/index.cgi"+1, X_OK) != 0)
diff --git a/src/busybox/init.busybox b/src/busybox/init.busybox
index c424e87..bc84153 100755
--- a/src/busybox/init.busybox
+++ b/src/busybox/init.busybox
@@ -3,12 +3,21 @@
 SCRIPT_DIR=$(cd `dirname $0` && pwd)
 cd $SCRIPT_DIR
 
+source config.busybox
+
 rm -rf ./_install
 
-cd busybox 
-git reset --hard || exit 1
+if [ ! -f "${ARCHIVE}" ]; then
+    wget "${MAIN_URL}"
+fi
+
+tar xvf "${ARCHIVE}"
+
+cd "${BUILD_FOLDER}"
 
+patch -p1 < ../gzdef.patch
 patch -p1 < ../onvif.patch
+patch -p1 < ../auth.patch
 
 cp ../.config ./ || exit 1
 
diff --git a/src/busybox/onvif.patch b/src/busybox/onvif.patch
index 5a4e2c2..6507ba2 100644
--- a/src/busybox/onvif.patch
+++ b/src/busybox/onvif.patch
@@ -1,7 +1,7 @@
-diff -Naur busybox.ori/networking/httpd.c busybox/networking/httpd.c
---- busybox.ori/networking/httpd.c	2024-01-25 11:34:58.935415874 +0100
-+++ busybox/networking/httpd.c	2024-01-25 21:14:16.277287558 +0100
-@@ -2316,6 +2316,13 @@
+diff -Naur busybox-1.36.1.ori/networking/httpd.c busybox-1.36.1/networking/httpd.c
+--- busybox-1.36.1.ori/networking/httpd.c	2024-01-08 16:45:49.504118695 +0100
++++ busybox-1.36.1/networking/httpd.c	2024-01-08 16:52:14.701167800 +0100
+@@ -2406,6 +2406,13 @@
  		}
  		cgi_type = CGI_NORMAL;
  	}

From 1ecf7beeff1f896022c85ee760c0e560be25c3bd Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Wed, 31 Jan 2024 12:24:16 +0100
Subject: [PATCH 69/81] Minor fixes

---
 src/libfuse/compile.libfuse                         | 4 ++--
 src/onvif_simple_server/compile.onvif_simple_server | 1 -
 src/rRTSPServer/init.rRTSPServer                    | 2 +-
 src/static/static/home/yi-hack-v5/script/system.sh  | 2 --
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/libfuse/compile.libfuse b/src/libfuse/compile.libfuse
index 2dbabe0..55941ec 100755
--- a/src/libfuse/compile.libfuse
+++ b/src/libfuse/compile.libfuse
@@ -12,5 +12,5 @@ ninja || exit 1
 
 rsync -av lib/libfuse3.so* ../../_install/lib/ || exit 1
 
-arm-hisiv300-linux-uclibcgnueabi-strip ../../_install/lib/* || exit 1
-
+arm-hisiv300-linux-uclibcgnueabi-strip ../../_install/lib/libfuse3.so.3.4.2 || exit 1
+arm-hisiv300-linux-uclibcgnueabi-strip ../../_install/lib/libfuse3.so.3.4.2.p/*.o || exit 1
diff --git a/src/onvif_simple_server/compile.onvif_simple_server b/src/onvif_simple_server/compile.onvif_simple_server
index 44efe7a..7219c61 100755
--- a/src/onvif_simple_server/compile.onvif_simple_server
+++ b/src/onvif_simple_server/compile.onvif_simple_server
@@ -35,7 +35,6 @@ mkdir -p ../_install/bin || exit 1
 mkdir -p ../_install/etc/onvif_notify_server || exit 1
 mkdir -p ../_install/etc/wsd_simple_server || exit 1
 
-cp ./onvif_simple_server ../_install/www/onvif || exit 1
 cp ./onvif_simple_server ../_install/www/onvif || exit 1
 echo "#!/tmp/sd/yi-hack-v5/www/onvif/onvif_simple_server" > ../_install/www/onvif/device_service
 chmod 0755 ../_install/www/onvif/device_service
diff --git a/src/rRTSPServer/init.rRTSPServer b/src/rRTSPServer/init.rRTSPServer
index 1567571..02bd2b2 100755
--- a/src/rRTSPServer/init.rRTSPServer
+++ b/src/rRTSPServer/init.rRTSPServer
@@ -30,7 +30,7 @@ fi
 tar zxvf $ARCHIVE
 
 patch -p0 < rRTSPServer.patch
-patch -p0 < rRTSPServer2.patch
+#patch -p0 < rRTSPServer2.patch
 
 cd live || exit 1
 
diff --git a/src/static/static/home/yi-hack-v5/script/system.sh b/src/static/static/home/yi-hack-v5/script/system.sh
index 232f6a2..7b95604 100755
--- a/src/static/static/home/yi-hack-v5/script/system.sh
+++ b/src/static/static/home/yi-hack-v5/script/system.sh
@@ -224,8 +224,6 @@ mkdir -p $YI_HACK_PREFIX/etc/dropbear
     dropbear -R -B
 fi
 
-ipc_multiplexer &
-
 mqttv4 &
 if [[ $(get_config MQTT) == "yes" ]] ; then
     mqtt-config &

From 7b2a9baa8e9ea1f70c027c40d0e9fdd227f10f69 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Wed, 31 Jan 2024 12:24:48 +0100
Subject: [PATCH 70/81] Fix syntax error in system_init.sh

---
 src/static/static/home/yi-hack-v5/script/system_init.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/static/static/home/yi-hack-v5/script/system_init.sh b/src/static/static/home/yi-hack-v5/script/system_init.sh
index d381886..cbf2c22 100755
--- a/src/static/static/home/yi-hack-v5/script/system_init.sh
+++ b/src/static/static/home/yi-hack-v5/script/system_init.sh
@@ -17,8 +17,8 @@ DHCP_SCRIPT_DEST="/home/app/script/wifidhcp.sh"
 UDHCP_SCRIPT="$YI_HACK_V5_PREFIX/yi-hack-v5/script/default.script"
 DHCP_SCRIPT="$YI_HACK_V5_PREFIX/yi-hack-v5/script/wifidhcp.sh"
 
-files=`find $YI_PREFIX -maxdepth 1 -name "*.7z"`
-if [ ${#files[@]} -gt 0 ]; then
+files=`find $YI_PREFIX -maxdepth 1 -name "*.7z" | awk 'END { print NR }'`
+if [ $files -gt 0 ]; then
 	/home/base/tools/7za x "$YI_PREFIX/*.7z" -y -o$YI_PREFIX
 	rm $YI_PREFIX/*.7z
 fi

From b8eab194596c7d06895e24eb4de76ff477e6ac71 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Wed, 31 Jan 2024 13:29:05 +0000
Subject: [PATCH 71/81] [~] Update to init.busybox

---
 src/busybox/init.busybox | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/src/busybox/init.busybox b/src/busybox/init.busybox
index 6f71f86..5f1a810 100755
--- a/src/busybox/init.busybox
+++ b/src/busybox/init.busybox
@@ -19,25 +19,4 @@ patch -p1 < ../gzdef.patch
 patch -p1 < ../onvif.patch
 patch -p1 < ../auth.patch
 
-cp ../.config ./ || exit 1#!/bin/bash
-
-SCRIPT_DIR=$(cd `dirname $0` && pwd)
-cd $SCRIPT_DIR
-
-source config.busybox
-
-rm -rf ./_install
-
-if [ ! -f "${ARCHIVE}" ]; then
-    wget "${MAIN_URL}"
-fi
-
-tar xvf "${ARCHIVE}"
-
-cd "${BUILD_FOLDER}"
-
-patch -p1 < ../gzdef.patch
-patch -p1 < ../onvif.patch
-patch -p1 < ../auth.patch
-
 cp ../.config ./ || exit 1

From 2d2a0f542e9da6b83b1321b65acffef243670f0b Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Wed, 31 Jan 2024 14:01:34 +0000
Subject: [PATCH 72/81] [Fix] libfuse change  Changes to be committed: 
 modified:   src/libfuse/compile.libfuse

---
 src/libfuse/compile.libfuse | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libfuse/compile.libfuse b/src/libfuse/compile.libfuse
index 55941ec..d5260f5 100755
--- a/src/libfuse/compile.libfuse
+++ b/src/libfuse/compile.libfuse
@@ -13,4 +13,4 @@ ninja || exit 1
 rsync -av lib/libfuse3.so* ../../_install/lib/ || exit 1
 
 arm-hisiv300-linux-uclibcgnueabi-strip ../../_install/lib/libfuse3.so.3.4.2 || exit 1
-arm-hisiv300-linux-uclibcgnueabi-strip ../../_install/lib/libfuse3.so.3.4.2.p/*.o || exit 1
+#arm-hisiv300-linux-uclibcgnueabi-strip ../../_install/lib/libfuse3.so.3.4.2.p/*.o || exit 1

From ffa50c41cafb6094f1c5dc974af20dc34afd0c28 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Wed, 31 Jan 2024 14:15:16 +0000
Subject: [PATCH 73/81] [-] Remove additional WPA content  Changes to be
 committed: 	modified:   src/wpa/install.wpa

---
 src/wpa/install.wpa | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wpa/install.wpa b/src/wpa/install.wpa
index c53b786..f994716 100755
--- a/src/wpa/install.wpa
+++ b/src/wpa/install.wpa
@@ -6,12 +6,12 @@ cd $SCRIPT_DIR
 # Compress the file
 #upx ./_install/sbin/curl
 
-mkdir -p ../../build/home/yi-hack-v5/wpa/
+#mkdir -p ../../build/home/yi-hack-v5/wpa/
 mkdir -p ../../build/home/base/tools/
 mkdir -p ../../build/home/lib/
 
-rsync -r ./_install/usr/local/sbin/ ../../build/home/yi-hack-v5/wpa/
-cp sysroot/lib/libcrypto.so.1.1 ../../build/home/yi-hack-v5/wpa/
+#rsync -r ./_install/usr/local/sbin/ ../../build/home/yi-hack-v5/wpa/
+#cp sysroot/lib/libcrypto.so.1.1 ../../build/home/yi-hack-v5/wpa/
 
 rsync -r ./_install/usr/local/sbin/ ../../build/home/base/tools/
 cp sysroot/lib/libcrypto.so.1.1 ../../build/home/lib/

From 73a1beb106a7cba04ae34a671630ff66ed10354e Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Thu, 1 Feb 2024 12:17:29 +0100
Subject: [PATCH 74/81] Add is_running option to onvif_simple_server.conf

---
 src/static/static/home/yi-hack-v5/script/system.sh | 2 ++
 src/www/httpd/cgi-bin/service.sh                   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/static/static/home/yi-hack-v5/script/system.sh b/src/static/static/home/yi-hack-v5/script/system.sh
index 7b95604..828e1a2 100755
--- a/src/static/static/home/yi-hack-v5/script/system.sh
+++ b/src/static/static/home/yi-hack-v5/script/system.sh
@@ -43,6 +43,7 @@ if [ ! -L "/home/yi-hack-v5/.ash_history" ]; then
 fi
 
 ulimit -s 1024
+mkdir /dev/shm
 
 # Remove core files, if any
 rm -f $YI_HACK_PREFIX/bin/core
@@ -333,6 +334,7 @@ if [[ $(get_config ONVIF) == "yes" ]] ; then
         echo "#PTZ" >> $ONVIF_SRVD_CONF
         echo "ptz=1" >> $ONVIF_SRVD_CONF
         echo "get_position=/tmp/sd/yi-hack-v5/bin/ipc_cmd -g" >> $ONVIF_SRVD_CONF
+        echo "is_running=/tmp/sd/yi-hack-v5/bin/ipc_cmd -u" >> $ONVIF_SRVD_CONF
         echo "move_left=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m left" >> $ONVIF_SRVD_CONF
         echo "move_right=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m right" >> $ONVIF_SRVD_CONF
         echo "move_up=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m up" >> $ONVIF_SRVD_CONF
diff --git a/src/www/httpd/cgi-bin/service.sh b/src/www/httpd/cgi-bin/service.sh
index fc10ff0..8416008 100755
--- a/src/www/httpd/cgi-bin/service.sh
+++ b/src/www/httpd/cgi-bin/service.sh
@@ -135,6 +135,7 @@ start_onvif()
         echo "#PTZ" >> $ONVIF_SRVD_CONF
         echo "ptz=1" >> $ONVIF_SRVD_CONF
         echo "get_position=/tmp/sd/yi-hack-v5/bin/ipc_cmd -g" >> $ONVIF_SRVD_CONF
+        echo "is_running=/tmp/sd/yi-hack-v5/bin/ipc_cmd -u" >> $ONVIF_SRVD_CONF
         echo "move_left=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m left" >> $ONVIF_SRVD_CONF
         echo "move_right=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m right" >> $ONVIF_SRVD_CONF
         echo "move_up=/tmp/sd/yi-hack-v5/bin/ipc_cmd -m up" >> $ONVIF_SRVD_CONF

From cda71ebe850718338f0055bf20852bbcf3c21707 Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Thu, 1 Feb 2024 12:18:34 +0100
Subject: [PATCH 75/81] Minor fixes to cloudAPI_fake

---
 src/static/static/home/yi-hack-v5/script/cloudAPI_fake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/static/static/home/yi-hack-v5/script/cloudAPI_fake b/src/static/static/home/yi-hack-v5/script/cloudAPI_fake
index 5bfc867..378a4cf 100755
--- a/src/static/static/home/yi-hack-v5/script/cloudAPI_fake
+++ b/src/static/static/home/yi-hack-v5/script/cloudAPI_fake
@@ -73,7 +73,7 @@ done
 
 if [ "$c" = "138" ]; then
     #CMD_do_login_v4
-    echo '{"code":"20000","appParam":"","css_flag":0,"css_mode":0,"codingProtocol":"265","abilityTable":""}'
+    echo '{"code":"20000","appParam":{},"css_flag":0,"css_mode":0,"codingProtocol":"265","abilityTable":""}'
     #{"code":"20000","appParam":{"schedule_power":{"schedule_power_on":{"enable":0,"repeater":"","time":"2212220800"},"schedule_power_off":{"enable":0,"repeater":"","time":"2212222200"}}},"css_flag":0,"css_mode":0,"codingProtocol":"265","abilityTable":"","restartTpye":1}
 elif [ "$c" = "136" ]; then
     #CMD_do_syntime
@@ -93,10 +93,10 @@ elif [ "$c" = "142" ]; then
     #CMD_do_get_dev_info
     TIMEZONE=$(get_config TIMEZONE)
     TZP=$(TZ="$TIMEZONE" date +%z)
-    TZP_SET=$(echo ${TZP:1:2} ${TZP:3:2} | awk '{ print ($1*3600+$2*60) }')
+    TZP_SET=$(echo ${TZP:0:1} ${TZP:1:2} ${TZP:3:2} | awk '{ print ($1$2*3600+$3*60) }')
     TZP_GMT=$(echo GMT${TZP:0:1}${TZP:1:2}:${TZP:3:2})
-    #echo '{"code":"20000","data":{"timezone":"'$TZP_GMT'","language":"en-US","tz_offset":'$TZP_SET'000,"css_flag":0,"css_mode":0,"appParam":"","doorbellCoolingDuration":"0"}}'
-    echo '{"code":"20000","data":{"timezone":"'$TZP_GMT'","language":"en-US","tz_offset":'$TZP_SET'000,"css_flag":0,"css_mode":0,"appParam":"","doorbellCoolingDuration":"0","allowFeature":{"Vehicle":0,"Animal":0,"Person":1}}}'
+    #echo '{"code":"20000","data":{"timezone":"'$TZP_GMT'","language":"en-US","tz_offset":'$TZP_SET'000,"css_flag":0,"css_mode":0,"appParam":{},"doorbellCoolingDuration":"0"}}'
+    echo '{"code":"20000","data":{"timezone":"'$TZP_GMT'","language":"en-US","tz_offset":'$TZP_SET'000,"css_flag":0,"css_mode":0,"appParam":{},"doorbellCoolingDuration":"0","allowFeature":{"Vehicle":0,"Animal":0,"Person":1}}}'
     #{"code":"20000","data":{"timezone":"GMT+01:00","language":"en-US","tz_offset":3600000,"css_flag":0,"css_mode":0,"appParam":{"schedule_power":{"schedule_power_on":{"enable":0,"repeater":"","time":"2212220800"},"schedule_power_off":{"enable":0,"repeater":"","time":"2212222200"}}},"doorbellCoolingDuration":"0","model":"38","allowFeature":{"Vehicle":0,"Animal":0,"Person":1}}}
 elif [ "$c" = "304" ]; then
     #CMD_do_update_event_v4

From 755b6562ffda58dd167e81fa25de86744cf8e661 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Sun, 4 Feb 2024 08:25:27 +0000
Subject: [PATCH 76/81] [Pre-Release] 0.4.1[e] Release Candidate  Changes to be
 committed: 	modified:   VERSION 	modified:  
 src/static/static/home/yi-hack-v5/script/system.sh

---
 VERSION                                            | 2 +-
 src/static/static/home/yi-hack-v5/script/system.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 485ed42..49755d9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.1d
+0.4.1e
diff --git a/src/static/static/home/yi-hack-v5/script/system.sh b/src/static/static/home/yi-hack-v5/script/system.sh
index 5a3ab06..9e11fcc 100755
--- a/src/static/static/home/yi-hack-v5/script/system.sh
+++ b/src/static/static/home/yi-hack-v5/script/system.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# 0.4.0c
+# 0.4.1e
 
 CONF_FILE="etc/system.conf"
 
@@ -148,7 +148,7 @@ fi
 # Version Firmware Check
 if [ -f "/home/yi-hack-v5/version" ]; then
   version=$(cat /home/yi-hack-v5/version)
-  if [[ "$version" != "0.3.8" ]]; then
+  if [[ "$version" != "0.4.1" ]]; then
     echo "Your baseline $version (rootfs and home partitions) is incorrect. Ignore if you are using a pre-release version. Please refer to https://github.com/alienatedsec/yi-hack-v5/discussions/267"
     echo "Your baseline $version (rootfs and home partitions) is incorrect, Ignore if you are using a pre-release version. Please refer to https://github.com/alienatedsec/yi-hack-v5/discussions/267" > "/tmp/sd/hackerror.txt"
   fi

From d7364400a2c79e3b21c08b5e4d71c51b3e681f69 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Sun, 4 Feb 2024 09:17:13 +0000
Subject: [PATCH 77/81] [~] Update Readme for 0.4.1 release

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 52a7448..bac96ab 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
 The answer is simple: missing updates, RTSP, and not based on the latest stock firmware (which features improvements and new cool stuff).
 Besides, there were no updates to `yi-hack-v4`, and I am against that RTSP licensing model. I have contributed enough and will continue my work separately.
 
-I am slowly releasing beta versions, and I can see lots of downloads, testing and contributions. A big thank you to the community.
+I am slowly working on pre-release versions, and I can see lots of downloads, testing and contributions. A big thank you to the community.
 
 ## Table of Contents
 
@@ -109,7 +109,7 @@ Alternative way:
 
 </p></details>
 
-3. Get the correct firmware files for your camera from the latest baseline release link: https://github.com/alienatedsec/yi-hack-v5/releases/tag/0.3.8
+3. Get the correct firmware files for your camera from the latest baseline release link: https://github.com/alienatedsec/yi-hack-v5/releases/tag/0.4.1
 
 | Camera | rootfs partition | home partition | Remarks |
 | --- | --- | --- | --- |
@@ -138,7 +138,7 @@ Depending upon your network setup, accessing the web interface with the hostname
 
 This can be done from the App. Please open the app, and go to the Camera Settings --> Network Info --> IP Address.
 
-Access the web interface by entering the IP address of the camera in a web browser. e.g. `http://192.168.1.5:8080`
+Access the web interface by entering the IP address of the camera in a web browser. e.g. `http://192.168.1.5`
 
 **_IMPORTANT: If you have multiple cameras. It is important to configure each camera with a unique hostname. Otherwise, the web interface will only be accessible by IP address._**
 

From 590ebe78aee08d1812111df9bce8c4b37f8eab33 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Sat, 10 Feb 2024 09:26:37 +0000
Subject: [PATCH 78/81] [Fix] Attempt for #334 and #336 thanks @lebestnoob 
 Changes to be committed: 	modified:   scripts/pack_fw.sh 	modified:  
 src/static/static/home/yi-hack-v5/script/system.sh# 	modified:  
 src/static/static/home/yi-hack-v5/script/system_init.sh 	modified:  
 src/wpa/install.wpa

---
 scripts/pack_fw.sh                                 |  7 ++++++-
 src/static/static/home/yi-hack-v5/script/system.sh | 10 ++++++++--
 .../static/home/yi-hack-v5/script/system_init.sh   | 14 ++++++++++++++
 src/wpa/install.wpa                                |  3 ++-
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/scripts/pack_fw.sh b/scripts/pack_fw.sh
index 85f0654..8f4bfad 100755
--- a/scripts/pack_fw.sh
+++ b/scripts/pack_fw.sh
@@ -206,6 +206,10 @@ compress_file "$TMP_DIR/home/app" cloudAPI
 compress_file "$TMP_DIR/home/app" oss
 compress_file "$TMP_DIR/home/app" p2p_tnp
 compress_file "$TMP_DIR/home/app" rmm
+compress_file "$TMP_DIR/home/base/tools" wpa_supplicant
+compress_file "$TMP_DIR/home/base/tools" wpa_passphrase
+compress_file "$TMP_DIR/home/base/tools" wpa_cli
+compress_file "$TMP_DIR/home/lib" libcrypto.so.1.1
 
 # Compress the yi-hack-v5 folder
 printf "Compressing yi-hack-v5... "
@@ -223,8 +227,9 @@ rm $TMP_DIR/home/yi-hack-v5/yi-hack-v5.7z
 echo "Deleteing of yi-hack-v5.7z - done!"
 
 # Delete all the compressed files except system_init.sh and yi-hack-v5.7z
+#find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type d ! -name 'script' -exec rm -rf {} +
 find $TMP_DIR/home/yi-hack-v5/script/ -maxdepth 0 ! -name 'system_init.sh' -type f -exec rm -f {} +
-find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type d ! -name 'script' -exec rm -rf {} +
+find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type d ! \( -name 'script' -o -name 'etc' \) -exec rm -rf {} \;
 find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type f ! -name 'version' -exec rm {} +
 printf "done!\n\n"
 
diff --git a/src/static/static/home/yi-hack-v5/script/system.sh b/src/static/static/home/yi-hack-v5/script/system.sh
index 9e11fcc..b337bcf 100755
--- a/src/static/static/home/yi-hack-v5/script/system.sh
+++ b/src/static/static/home/yi-hack-v5/script/system.sh
@@ -167,7 +167,10 @@ if [[ $(get_config DISABLE_CLOUD) == "no" ]] ; then
         cd /home/app
         killall dispatch
         LD_PRELOAD=/home/yi-hack-v5/lib/ipc_multiplex.so ./dispatch &
-        sleep 2
+        sleep 3
+        if [[ $(get_config TIME_OSD) == "yes" ]] ; then
+            echo -ne '\x01\x00\x00\x00' | dd of=/tmp/mmap.info bs=1 seek=0 count=4 conv=notrunc
+        fi
         LD_LIBRARY_PATH="/home/yi-hack-v5/lib:/lib:/home/lib:/home/app/locallib:/home/hisiko/hisilib" ./rmm &
         sleep 8
         ./mp4record &
@@ -184,7 +187,10 @@ if [[ $(get_config DISABLE_CLOUD) == "yes" ]] ; then
         cd /home/app
         killall dispatch
         LD_PRELOAD=/home/yi-hack-v5/lib/ipc_multiplex.so ./dispatch &
-        sleep 2
+        sleep 3
+        if [[ $(get_config TIME_OSD) == "yes" ]] ; then
+            echo -ne '\x01\x00\x00\x00' | dd of=/tmp/mmap.info bs=1 seek=0 count=4 conv=notrunc
+        fi
         LD_LIBRARY_PATH="/home/yi-hack-v5/lib:/lib:/home/lib:/home/app/locallib:/home/hisiko/hisilib" ./rmm &
 		sleep 8
         if [[ $(get_config REC_WITHOUT_CLOUD) == "yes" ]] ; then
diff --git a/src/static/static/home/yi-hack-v5/script/system_init.sh b/src/static/static/home/yi-hack-v5/script/system_init.sh
index cbf2c22..6dac806 100755
--- a/src/static/static/home/yi-hack-v5/script/system_init.sh
+++ b/src/static/static/home/yi-hack-v5/script/system_init.sh
@@ -7,6 +7,8 @@ if [ -d "/usr/yi-hack-v5" ]; then
 elif [ -d "/home/yi-hack-v5" ]; then
     YI_HACK_V5_PREFIX="/home"
     YI_PREFIX="/home/app"
+    YI_BASE="/home/base/tools"
+    YI_LIB="/home/lib"
     UDHCPC_SCRIPT_DEST="/home/app/script/default.script"
 fi
 
@@ -23,6 +25,18 @@ if [ $files -gt 0 ]; then
 	rm $YI_PREFIX/*.7z
 fi
 
+files=`find $YI_BASE -maxdepth 1 -name "*.7z" | awk 'END { print NR }'`
+if [ $files -gt 0 ]; then
+	/home/base/tools/7za x "$YI_BASE/*.7z" -y -o$YI_BASE
+	rm $YI_BASE/*.7z
+fi
+
+files=`find $YI_LIB -maxdepth 1 -name "*.7z" | awk 'END { print NR }'`
+if [ $files -gt 0 ]; then
+	/home/base/tools/7za x "$YI_LIB/*.7z" -y -o$YI_LIB
+	rm $YI_BASE/*.7z
+fi
+
 if [ -f $ARCHIVE_FILE ]; then
 	/home/base/tools/7za x $ARCHIVE_FILE -y -o$DESTDIR
 	rm $ARCHIVE_FILE
diff --git a/src/wpa/install.wpa b/src/wpa/install.wpa
index f994716..663226b 100755
--- a/src/wpa/install.wpa
+++ b/src/wpa/install.wpa
@@ -14,4 +14,5 @@ mkdir -p ../../build/home/lib/
 #cp sysroot/lib/libcrypto.so.1.1 ../../build/home/yi-hack-v5/wpa/
 
 rsync -r ./_install/usr/local/sbin/ ../../build/home/base/tools/
-cp sysroot/lib/libcrypto.so.1.1 ../../build/home/lib/
+arm-hisiv300-linux-strip sysroot/lib/libcrypto.so.1.1
+cp sysroot/lib/libcrypto.so* ../../build/home/lib/

From ca25da428a4b10cbe7ab6376959789d109558e7d Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Sat, 10 Feb 2024 10:48:37 +0000
Subject: [PATCH 79/81] [Pre-Release] 0.4.1f and delete compressed files fix 
 Changes to be committed: 	modified:   VERSION 	modified:  
 src/static/static/home/yi-hack-v5/script/system_init.sh

---
 VERSION                                                 | 2 +-
 src/static/static/home/yi-hack-v5/script/system_init.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 49755d9..bafd02f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.1e
+0.4.1f
diff --git a/src/static/static/home/yi-hack-v5/script/system_init.sh b/src/static/static/home/yi-hack-v5/script/system_init.sh
index 6dac806..66a0b36 100755
--- a/src/static/static/home/yi-hack-v5/script/system_init.sh
+++ b/src/static/static/home/yi-hack-v5/script/system_init.sh
@@ -34,7 +34,7 @@ fi
 files=`find $YI_LIB -maxdepth 1 -name "*.7z" | awk 'END { print NR }'`
 if [ $files -gt 0 ]; then
 	/home/base/tools/7za x "$YI_LIB/*.7z" -y -o$YI_LIB
-	rm $YI_BASE/*.7z
+	rm $YI_LIB/*.7z
 fi
 
 if [ -f $ARCHIVE_FILE ]; then

From 8737a36937d49048f0d225f31e7991f3e8ffcf94 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Sat, 10 Feb 2024 21:02:17 +0000
Subject: [PATCH 80/81] [Pre-Release] 0.4.1g - Minor fixes and readded
 system.sh upgrade functions  Changes to be committed: 	modified:   VERSION 
 modified:   scripts/pack_fw.sh 	modified:  
 src/static/static/home/yi-hack-v5/script/system.sh

---
 VERSION                                       |  2 +-
 scripts/pack_fw.sh                            |  3 +-
 .../static/home/yi-hack-v5/script/system.sh   | 39 +++++++++++++++++--
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/VERSION b/VERSION
index bafd02f..bbf7b85 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.1f
+0.4.1g
diff --git a/scripts/pack_fw.sh b/scripts/pack_fw.sh
index 8f4bfad..4ffe3fc 100755
--- a/scripts/pack_fw.sh
+++ b/scripts/pack_fw.sh
@@ -229,7 +229,8 @@ echo "Deleteing of yi-hack-v5.7z - done!"
 # Delete all the compressed files except system_init.sh and yi-hack-v5.7z
 #find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type d ! -name 'script' -exec rm -rf {} +
 find $TMP_DIR/home/yi-hack-v5/script/ -maxdepth 0 ! -name 'system_init.sh' -type f -exec rm -f {} +
-find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type d ! \( -name 'script' -o -name 'etc' \) -exec rm -rf {} \;
+find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type d ! \( -name 'script' -o -name 'etc' -o -name 'lib' \) -exec rm -rf {} \;
+find $TMP_DIR/home/yi-hack-v5/lib/ -type f ! -name 'ipc_multiplex.so' -exec rm -f {} \;
 find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type f ! -name 'version' -exec rm {} +
 printf "done!\n\n"
 
diff --git a/src/static/static/home/yi-hack-v5/script/system.sh b/src/static/static/home/yi-hack-v5/script/system.sh
index b337bcf..e85d28e 100755
--- a/src/static/static/home/yi-hack-v5/script/system.sh
+++ b/src/static/static/home/yi-hack-v5/script/system.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# 0.4.1e
+# 0.4.1g
 
 CONF_FILE="etc/system.conf"
 
@@ -28,6 +28,25 @@ export PATH=/usr/bin:/usr/sbin:/bin:/sbin:/home/base/tools:/home/yi-hack-v5/bin:
 #  ln -sf /dev/null /var/run/utmp
 #fi
 
+# Upgrade wpa_supplicant modules - after 0.4.1 baseline
+if [ -f $YI_HACK_PREFIX/wpa/wpa_supplicant_upgrade ]; then
+	ifconfig wlan0 up
+    echo "---backing up wpa---"
+    cp /home/base/tools/wpa_supplicant $YI_HACK_PREFIX/wpa/wpa_supplicant_backup
+    cp /home/base/tools/wpa_cli $YI_HACK_PREFIX/wpa/wpa_cli_backup
+    cp /home/base/tools/wpa_passphrase $YI_HACK_PREFIX/wpa/wpa_passphrase_backup
+    killall watch_process
+    killall wpa*
+    mv /tmp/sd/yi-hack-v5/wpa/*.so* /home/lib/
+    mv /tmp/sd/yi-hack-v5/wpa/wpa_supplicant /home/base/tools/
+    mv /tmp/sd/yi-hack-v5/wpa/wpa_cli /home/base/tools/
+    mv /tmp/sd/yi-hack-v5/wpa/wpa_passphrase /home/base/tools/
+    reboot
+    echo "---wpa upgrade done---"
+else
+	echo "---no wpa upgrade---"
+fi
+
 #reversing symlinks
 if [ -L "/var/run/utmp" ]; then
   rm /var/run/utmp
@@ -73,6 +92,11 @@ if [[ "$(grep -m 3 -n '' /home/app/cloudAPI_fake | tail -n 1 | cut -d ':' -f 2 |
   cp -f $YI_HACK_PREFIX/script/cloudAPI_fake /home/app/
 fi
 
+# Update cloudAPI if necessary
+if [[ "$(grep -m 3 -n '' /home/app/cloudAPI | tail -n 1 | cut -d ':' -f 2 | cut -c 3-)" != "$(grep -m 3 -n '' $YI_HACK_PREFIX/script/cloudAPI | tail -n 1 | cut -d ':' -f 2 | cut -c 3-)" ]]; then
+  cp -f $YI_HACK_PREFIX/script/cloudAPI /home/app/
+fi
+
 # Manual Wi-Fi config
 if [ -f /tmp/sd/recover/configure_wifi.cfg ]; then
 	mv /tmp/sd/recover/configure_wifi.cfg /tmp/configure_wifi.cfg
@@ -80,6 +104,10 @@ if [ -f /tmp/sd/recover/configure_wifi.cfg ]; then
 	sh $YI_HACK_PREFIX/script/configure_wifi.sh
 fi
 
+if [ -f "/tmp/sd/recover/mtdblock2_recover.bin" ]; then
+	sync
+	sh $YI_HACK_PREFIX/script/configure_wifi.sh
+fi
 $YI_HACK_PREFIX/script/check_conf.sh
 
 hostname -F $YI_HACK_PREFIX/etc/hostname
@@ -246,8 +274,12 @@ if [[ $HTTPD_PORT != "80" ]] ; then
     D_HTTPD_PORT=:$HTTPD_PORT
 fi
 
-if [[ $(get_config ONVIF_WM_SNAPSHOT) == "yes" ]] ; then
-    WATERMARK="&watermark=yes"
+if [[ $(get_config SNAPSHOT) == "no" ]] ; then
+    touch /tmp/snapshot.disabled
+fi
+
+if [[ $(get_config SNAPSHOT_LOW) == "yes" ]] ; then
+    touch /tmp/snapshot.low
 fi
 
 RRTSP_MODEL=$MODEL_SUFFIX
@@ -438,4 +470,3 @@ fi
 $YI_HACK_PREFIX/script/check_update.sh
 
 crond -c $YI_HACK_PREFIX/etc/crontabs
-

From 8d13a5cd61a748dbe988663824616123f14d5461 Mon Sep 17 00:00:00 2001
From: alienatedsec <73167064+alienatedsec@users.noreply.github.com>
Date: Sat, 10 Feb 2024 23:34:22 +0000
Subject: [PATCH 81/81] [Fix] wpa_supplicant baseline upgrade for yi_home and
 yi_dome  Changes to be committed: 	modified:   scripts/pack_fw.sh

---
 scripts/pack_fw.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/pack_fw.sh b/scripts/pack_fw.sh
index 4ffe3fc..d88d3d7 100755
--- a/scripts/pack_fw.sh
+++ b/scripts/pack_fw.sh
@@ -3,7 +3,7 @@
 #
 #  This file is part of yi-hack-v5 (https://github.com/alienatedsec/yi-hack-v5).
 #  Copyright (c) 2018-2019 Davide Maggioni - v4 specific
-#  Copyright (c) 2021-2023 alienatedsec - v5 specific
+#  Copyright (c) 2021-2024 alienatedsec - v5 specific
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -232,6 +232,10 @@ find $TMP_DIR/home/yi-hack-v5/script/ -maxdepth 0 ! -name 'system_init.sh' -type
 find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type d ! \( -name 'script' -o -name 'etc' -o -name 'lib' \) -exec rm -rf {} \;
 find $TMP_DIR/home/yi-hack-v5/lib/ -type f ! -name 'ipc_multiplex.so' -exec rm -f {} \;
 find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type f ! -name 'version' -exec rm {} +
+
+# Delete the old wpa_supplicant upgrade file from the image so it wont override the release version
+find $TMP_DIR/home/app/ -type f -name 'wpa_supplicant' -exec rm -f {} \;
+
 printf "done!\n\n"
 
 # home
@@ -253,4 +257,3 @@ printf "done!\n\n"
 echo "------------------------------------------------------------------------"
 echo " Finished!"
 echo "------------------------------------------------------------------------"
-