vs_projects/BosMon-Webserver
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Some tweaks to get it running right

Browse Source
This commit is contained in:
BlubbFish 2018-11-29 09:26:41 +00:00
parent 621794f0b3
commit c63be78a08
7 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BosMon-Webserver/BosMon-Webserver.csproj
View File

@ -25,9 +25,9 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>

4
BosMon-Webserver/POCSAG.cs
View File

@ -1,9 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Net;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Web;
namespace BlubbFish.BosMon.Webserver { namespace BlubbFish.BosMon.Webserver {
class POCSAG { class POCSAG {
@ -52,7 +52,7 @@ namespace BlubbFish.BosMon.Webserver {
internal String ToXML() { internal String ToXML() {
String ret = "<telegram>\r\n"; String ret = "<telegram>\r\n";
ret += "<function>"+this.Function+ "</function>\r\n"; ret += "<function>"+this.Function+ "</function>\r\n";
ret += "<message>"+ HttpUtility.HtmlEncode(this.Message) + "</message>\r\n"; ret += "<message>"+ WebUtility.HtmlEncode(this.Message) + "</message>\r\n";
ret += "<type>3</type>\r\n"; ret += "<type>3</type>\r\n";
ret += "<address>"+this.Address.ToString("D7")+ "</address>\r\n"; ret += "<address>"+this.Address.ToString("D7")+ "</address>\r\n";
ret += "<timestamp>"+((DateTimeOffset)this.Time).ToUnixTimeMilliseconds()+ "</timestamp>\r\n"; ret += "<timestamp>"+((DateTimeOffset)this.Time).ToUnixTimeMilliseconds()+ "</timestamp>\r\n";

9
BosMon-Webserver/XMLWebserver.cs
View File

@ -38,7 +38,7 @@ namespace BlubbFish.BosMon.Webserver {
ctx.Response.OutputStream.Close(); ctx.Response.OutputStream.Close();
ctx.Response.Close(); ctx.Response.Close();
} catch(Exception e) { } catch(Exception e) {
Helper.WriteError("Context Exception: " + e.Message +""+e.Source+ "\n\n" + e.StackTrace); Helper.WriteError("Context Exception: " + e.Message + " " + e.Source + "\n" + e.StackTrace);
} }
}, this._listener.GetContext()); }, this._listener.GetContext());
} }
@ -49,6 +49,7 @@ namespace BlubbFish.BosMon.Webserver {
} }
private void SendResponse(HttpListenerContext ctx) { private void SendResponse(HttpListenerContext ctx) {
try {
if (this.CheckAuth(ctx.Request)) { if (this.CheckAuth(ctx.Request)) {
ctx.Response.ContentType = "text/xml"; ctx.Response.ContentType = "text/xml";
ctx.Response.Headers.Add(HttpResponseHeader.Server, "BM Webserver 1.3"); ctx.Response.Headers.Add(HttpResponseHeader.Server, "BM Webserver 1.3");
@ -79,6 +80,10 @@ namespace BlubbFish.BosMon.Webserver {
} }
ctx.Response.StatusCode = 403; ctx.Response.StatusCode = 403;
} }
catch(Exception e) {
Helper.WriteError("Send Response Exception: " + e.Message + " " + e.Source + "\n" + e.StackTrace);
}
}
private void ParseInput(HttpListenerContext request) { private void ParseInput(HttpListenerContext request) {
if(this.CheckAuth(request.Request)) { if(this.CheckAuth(request.Request)) {
@ -91,7 +96,7 @@ namespace BlubbFish.BosMon.Webserver {
foreach (String item in items) { foreach (String item in items) {
String[] kv = item.Split('='); String[] kv = item.Split('=');
if (kv.Length == 2) { if (kv.Length == 2) {
kv[1] = HttpUtility.UrlDecode(kv[1]); kv[1] = WebUtility.UrlDecode(kv[1]);
input.Add(kv[0], kv[1]); input.Add(kv[0], kv[1]);
} }
} }

BIN
BosMon-Webserver/bin/Release/BosMon-Webserver.exe
View File

Binary file not shown.

BIN
BosMon-Webserver/bin/Release/Utils.dll
View File

Binary file not shown.

2
BosMon-Webserver/dpkg/bmweb.service
View File

@ -13,7 +13,7 @@ ExecStartPre=/bin/rm /var/log/bmweb.log
ExecStartPre=/bin/touch /var/log/bmweb.log ExecStartPre=/bin/touch /var/log/bmweb.log
ExecStartPre=/bin/chown bmweb:bmweb /var/log/bmweb.log ExecStartPre=/bin/chown bmweb:bmweb /var/log/bmweb.log
ExecStartPre=/bin/chmod 644 /var/log/bmweb.log ExecStartPre=/bin/chmod 644 /var/log/bmweb.log
ExecStart=/usr/bin/mono /usr/local/bin/bmweb/BosMon-Webserver.exe ExecStart=/usr/bin/mono --debug /usr/local/bin/bmweb/BosMon-Webserver.exe
KillMode=control-group KillMode=control-group
TimeoutStopSec=5 TimeoutStopSec=5
Restart=on-failure Restart=on-failure

2
BosMon-Webserver/dpkg/control
View File

@ -3,7 +3,7 @@ Version: x.x-x
Section: base Section: base
Priority: optional Priority: optional
Architecture: any Architecture: any
Depends: mono-runtime (>= 5.16.0), libmono-system-web4.0-cil (>= 5.16.0) Depends: mono-runtime (>= 5.16.0)
Maintainer: BlubbFish <dev@blubbfish.net> Maintainer: BlubbFish <dev@blubbfish.net>
Description: Bosmon-Webserver Description: Bosmon-Webserver
A Webserver for Bosmon Telegrafs A Webserver for Bosmon Telegrafs