Fix bug listening on the wrong port. Bind on a different port per camera

vdex42 · Oct 22, 2016 · 016abbe · 016abbe
1 parent a97f31a
commit 016abbe
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 27 deletions.
diff --git a/Readme.md b/Readme.md
@@ -7,7 +7,7 @@ SurveillanceMonitor is a windows service that connects to IP Cameras that run th
 ## Pre-Requisites
 * Windows only. 
 * [VideoLan](http://www.videolan.org/) should be installed 
-* .NET Framework
+* .NET Framework 4.6
 * Open ports/Port forwarding so that this application can connect to the camera, and so that the camera can connect to this application
 
 ## Capabilities
@@ -21,17 +21,29 @@ SurveillanceMonitor is a windows service that connects to IP Cameras that run th
 During installation you'll be prompted to enter some XML settings, this will be saved as *MonitorSettings.xml* in the installed folder.
 
 ` VlcFolder="C:\Program Files (x86)\VideoLAN\VLC"`
+
 `CallbackIp="192.168.0.102"` is the IP address of the machine running the Surveillance service
-`CallbackPort="8080"` is the port that the service should listen on for alerts
+
 
 For each camera
 `RtspSource="rtsp://admin:password@192.168.0.103:554/ISAPI/Streaming/channels/101"` enter the RTSP url to your camera. (you can test this out directly in vlc:  Media > Open Network stream )
+
 `CameraHttpUrl="http://192.168.0.103:80"` HTTP port of the camera. 
+
 `CameraUserName="admin"`
+
  `CameraPassword="password"`
 
+ `CallbackPort="8080"` is the port that the service should listen on for alerts from this camera
+
  And alert actions for the camera. At the moment only the VLC VideoDumper is supported
 `<alarmAction Type="VideoDumper">
     <setting Key="videoDumpDirectory" Value=".\videos\" ></setting>
     <setting Key="recordForSeconds" Value="30" ></setting>
-</alarmAction>`
+</alarmAction>`
+
+
+# Contributing to Surveillance
+
+I'd be willing to accept pull requests implementing any useful new features
+I'd love to hear feedback from other people using it.
diff --git a/SurveillanceMonitor.sln b/SurveillanceMonitor.sln
@@ -7,6 +7,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SurveillanceMonitor", "Surv
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SurveillanceMonitor.Tests", "SurveillanceMonitor.Tests\SurveillanceMonitor.Tests.csproj", "{D370732B-3701-4276-AAB3-1C4C6D049195}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Readme", "Readme", "{0A1DCEB1-4E42-4EE7-BA07-0AC33EF7A8C4}"
+	ProjectSection(SolutionItems) = preProject
+		Readme.md = Readme.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/SurveillanceMonitor/Infrastructure/Config/SurveillanceMonitorConfig.cs b/SurveillanceMonitor/Infrastructure/Config/SurveillanceMonitorConfig.cs
@@ -20,39 +20,33 @@ public class SurveillanceMonitorConfig
         public string VlcFolder { get; set; }
 
         [XmlAttribute]
-        public string CallbackIp { get; set; }
-
-        [XmlAttribute]
-        public ushort CallbackPort { get; set; }
+        public string CallbackIp { get; set; }        
 
         /// <remarks />
         [XmlType(AnonymousType = true)]
         public class SurveillanceMonitorCamera
         {
-            /// <remarks />
             [XmlAttribute]
             public string RtspSource { get; set; }
 
-            /// <remarks />
             [XmlAttribute]
             public string CameraHttpUrl { get; set; }
 
-            /// <remarks />
             [XmlAttribute]
             public string CameraUserName { get; set; }
 
-            /// <remarks />
             [XmlAttribute]
             public string CameraPassword { get; set; }
 
+            [XmlAttribute]
+            public ushort CallbackPort { get; set; }
+
             public int Id { get; set; }
         }
 
         [XmlType(AnonymousType = true)]
         public class SurveillanceMonitorAlarmAction
         {
-            //[XmlArray("settings")]
-            //[XmlArrayItem("setting", IsNullable = false)]
             [XmlElement("setting")]
             public SurveillanceMonitorAlarmActionSetting[] Settings { get; set; }
 
@@ -62,11 +56,9 @@ public class SurveillanceMonitorAlarmAction
             [XmlType(AnonymousType = true)]
             public class SurveillanceMonitorAlarmActionSetting
             {
-                /// <remarks />
                 [XmlAttribute]
                 public string Key { get; set; }
 
-                /// <remarks />
                 [XmlAttribute]
                 public string Value { get; set; }
             }

diff --git a/SurveillanceMonitor/MonitorSettings.Template.xml b/SurveillanceMonitor/MonitorSettings.Template.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <surveillanceMonitor
   VlcFolder="C:\Program Files (x86)\VideoLAN\VLC"
-  CallbackIp="192.168.0.102"
-  CallbackPort="8080">
+  CallbackIp="192.168.0.102"  >
   <cameras>
     <camera
       RtspSource="rtsp://admin:password@192.168.0.103:554/ISAPI/Streaming/channels/101"
       CameraHttpUrl="http://192.168.0.103:80"
       CameraUserName="admin"
-      CameraPassword="password">
+      CameraPassword="password"
+      CallbackPort="8080"
+      >
     </camera>
   </cameras>
   <alarmActions>

diff --git a/SurveillanceMonitor/Services/CameraMonitor.cs b/SurveillanceMonitor/Services/CameraMonitor.cs
@@ -30,7 +30,7 @@ public class CameraMonitor
         public void Start(CancellationToken cancellationToken)
         {
             _logger.Information($"Start Monitoring {_cameraSettings.CameraHttpUrl}");
-            _cameraService.SetAlarmCallbackUrlAsync(_settings.CallbackIp, _settings.CallbackPort);
+            _cameraService.SetAlarmCallbackUrlAsync(_settings.CallbackIp, _cameraSettings.CallbackPort);
 
             Task.Run(async () =>
                      {
@@ -42,7 +42,7 @@ public void Start(CancellationToken cancellationToken)
                                  webServer.PageReceivedEvent += (sender, page) => {
                                      _alarmHandlers.AlarmActivated(_cameraSettings);
                                  };
-                                 webServer.Bind(8080);
+                                 webServer.Bind(_cameraSettings.CallbackPort);
 
                              }
                              catch (Exception e)

diff --git a/SurveillanceMonitor/Services/IMiniSocketService.cs b/SurveillanceMonitor/Services/IMiniSocketService.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using System.Net;
 
 namespace SurveillanceMonitor.Services
 {
@@ -7,5 +8,6 @@ public interface IMiniSocketService
         void Listen(int port, int backlog);
         Stream GetNextRequest();
         void Stop();
+        IPAddress IpAddress { get; }
     }
 }
diff --git a/SurveillanceMonitor/Services/MiniSocketService.cs b/SurveillanceMonitor/Services/MiniSocketService.cs
@@ -9,12 +9,13 @@ namespace SurveillanceMonitor.Services
     public class MiniSocketService : IMiniSocketService
     {
         private Socket _listener;
+        public IPAddress IpAddress { get; private set; }
 
         public void Listen(int port, int backlog)
         {
             IPHostEntry ipHostInfo = Dns.GetHostEntry(Dns.GetHostName());
-            IPAddress ipAddress = ipHostInfo.AddressList.First(a=>a.AddressFamily== AddressFamily.InterNetwork);
-            IPEndPoint localEndPoint = new IPEndPoint(ipAddress, port);
+            IpAddress = ipHostInfo.AddressList.First(a=>a.AddressFamily== AddressFamily.InterNetwork);
+            IPEndPoint localEndPoint = new IPEndPoint(IpAddress, port);
             _listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
             _listener.Bind(localEndPoint);
             _listener.Listen(backlog);

diff --git a/SurveillanceMonitor/Services/MiniWebServer.cs b/SurveillanceMonitor/Services/MiniWebServer.cs
@@ -28,7 +28,7 @@ public void Bind(int port)
             _bound = true;
             while (true)
             {
-                _logger.Write(LogEventLevel.Information, $"Waiting for a connection... port:{port}");
+                _logger.Write(LogEventLevel.Information, $"Waiting for a connection... ip {_miniSocketService.IpAddress}  port:{port}");
                 // Program is suspended while waiting for an incoming connection.
 
                 try

diff --git a/SurveillanceMonitor/SurveillanceMonitor.csproj b/SurveillanceMonitor/SurveillanceMonitor.csproj
@@ -102,7 +102,6 @@
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Readme.md" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="MonitorSettings.Template.xml" />

diff --git a/SurveillanceMonitor/SurveillanceMonitorInstaller.iss b/SurveillanceMonitor/SurveillanceMonitorInstaller.iss
@@ -65,14 +65,14 @@ begin
   Memo.Text := '<?xml version="1.0" encoding="utf-8"?>'#13#10'' +
   '<surveillanceMonitor'#13#10'' +
   '  VlcFolder="' +  vlcFolder +'"'#13#10'' +
-  '  CallbackIp="192.168.0.102"'#13#10'' +
-  '  CallbackPort="8080">'#13#10'' +
+  '  CallbackIp="192.168.0.102">'#13#10'' +
   '  <cameras>'#13#10'' +
   '    <camera'#13#10'' +
   '      RtspSource="rtsp://admin:password@192.168.0.103:554/ISAPI/Streaming/channels/101"'#13#10'' +
   '      CameraHttpUrl="http://192.168.0.103:8040"'#13#10'' +
   '      CameraUserName="admin"'#13#10'' +
-  '      CameraPassword="password">'#13#10'' +
+  '      CameraPassword="password"'#13#10'' +
+  '      CallbackPort="8080">'#13#10'' +
   '    </camera>'#13#10'' +
   '  </cameras>'#13#10'' +
   '  <alarmActions>'#13#10'' +