From 95cfea4a1d6e06a9a2f36b3aa01c58cb1dde2fa8 Mon Sep 17 00:00:00 2001
From: iCAROS7 <hominlab@gmail.com>
Date: Mon, 5 Nov 2018 03:14:49 +0900
Subject: [PATCH] Modified version to 3.2.5.1

---
 server/Ets2Telemetry.exe                      | Bin 456704 -> 456704 bytes
 server/Ets2Telemetry.exe.config               | 130 +++++++++---------
 server/Ets2Telemetry.pdb                      | Bin 161280 -> 161280 bytes
 source/Funbit.Ets.Telemetry.Server/App.config | 130 +++++++++---------
 .../Funbit.Ets.Telemetry.Server.csproj        |   1 +
 .../Properties/AssemblyInfo.cs                |   6 +-
 6 files changed, 140 insertions(+), 127 deletions(-)

diff --git a/server/Ets2Telemetry.exe b/server/Ets2Telemetry.exe
index 64a6e3d93404e50746040dd0137db1057c136682..f7f08a3e1a57cf6a6e3725f008c8d53120e609fa 100644
GIT binary patch
delta 712
zcmXw%T}TvB6vxk*@m{l9DcxNYS6VUflWis~!G%~evl7WKGVwvnAWLW|jfjZWdN5kd
zhAHMjrIj9Hi;5U&9(tJ&s+TCphd{8Q-JX`%-IRO@>g)|KoIk($-OIgmIX99ii)6~~
z-;vV?zG=~N?9t-=E_lY^1kkV<D7p*F*oQa+pYf_os@Dgw3Qy^il!_k5er(iHDs~-B
z0mvXhEdc*&R!E=vaNW$FJlBTp`oLUe)4t*W1mP@YtH=(xK->#a%0Xd9M2<n6%s70Z
zybg|T&h2gLDowx=eB7FV+mtf?&o`iz+VU*ax*z9lBOhWW<q}_^eJb-;AZ3=$8+bG9
zjw!S7kTOBjF(n1x-L_zxc*E@oc8Kdepyt+qnu1FnzhFP{TTe)Eh}h>H7CcOR%X?bQ
z{Ypfb2$?nSq%bjIVr0Tf$%0U}P&TQJ5=XE@e0P`KkUP?DSQD9oYIEpOq7cz+eW6|3
zakY8%fjX0Hd;MIWc&Cj%v65BjDlXcCu=~iBi)YSH1llIX17qRK#@}Y_FtW{9VH^))
z531ID5WReAu?49lDw!(JT5MtK$LguqgSqxfR6YbqQg@S420gupdt2+C))}ki?F;dm
zz>Veof2`#w+k!>a^dvUNp&a|Q3NJPqY?}SB3h%Llh{{yw46{0C_{NaSkvA6uI7WAx
zHxwW+I#32Qrqg@`Lq;~uE750oGW?}H3V!2#h6mXggn@38;oWqH?kt~0RE?j%coS1;
b$B<RC#y?91F$UY|voC1v{LRy-Df#~Z<x=I(

delta 697
zcmXw%Ur19?9LImZdp&2GUNPLJG81ivX0q-ua&RFO3(7K0B^eSfq<SbS2m<k;S%HC=
zuKRET4cDKCEU@Sb7m?tSP*0Wl;=qEzDuO+1OU&Ntw-X)sefjXY=P$n-&HAEQ-}D{z
z=Hi#w#4ZfP<_EOT&lq$A4TnLasiBWOnP*TfKJ_TgW*8grfH_9lXwKsRmYJxOYxQXW
z6%=R!;EPtB^06ORt=#DgM{u_pp7pl|$^&3Pgt9~CanOkS;5_A^G{Z74!fi6wV1aTJ
zmQ8DRf9t-g6s*Ae9Vxg)sp7v}hD%kBIs?r8xS*JP8?z`^_y+CccWuC1tLlNk8=daB
zJ_A=NQ}j8mr{T5Rk?at!xs#HU#4Zm6^K&4Wh7+Dz$+g6@o;JyC#M_>T<OuN@@7ZAf
zDp6^oWIlMuq=`!tC)24{Je10j$|1E@k(8VyK3D0q<d1Y(Hf5$kwT9+Wr3hBXLTsdL
z<nr|OgM&|xE<d{eGO_eMWq)lztz4Wmuugal42dfS_M&dTG0@A$*V~awp;D;|?DclG
zb*z~hJDBgKLRF2_Q);C%!JxPAa9@q{>d#!|p6+`k{l%ftlx6>(V1=j^JZJe8a?}WI
zlKHSq?44xaM6ySzw@dG`Lx_#zT~o~Nn&R6-T0;Fl9Uvi2Wq3;w0HY(xi^&WhrmN;M
z+>dVI$?_L!gnp)XS#F3Ql~^m9ay&qf2<P|=qAs?6@>ZtPh9Nt+$yb$_URV@oP(nsG
M?47@O24lMGFJ!IWPXGV_

diff --git a/server/Ets2Telemetry.exe.config b/server/Ets2Telemetry.exe.config
index 7e1c494f..190208d6 100644
--- a/server/Ets2Telemetry.exe.config
+++ b/server/Ets2Telemetry.exe.config
@@ -1,62 +1,68 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
-  </configSections>
-  
-  <appSettings>
-
-    <!-- ============================================================================== -->
-    <!-- Warning: don't forget to restart the server to reload updated configuration!   -->
-    <!-- ============================================================================== -->
-    
-    <!-- When set to "true" the server will output test telemetry data -->
-    <!-- which is read from the Ets2TestTelemetry.json file. --> 
-    <!-- This is very helpful when you create/debug custom skins, -->
-    <!-- because any changes to this json files will be immediately reflected on the dashboard. -->
-    <add key="UseEts2TestTelemetryData" value="false" />
-
-    <!-- HTTP ETS2/ATS Telemetry broadcasting URL (empty if not used) -->
-    <!-- This URL should accept POST requests containing JSON body. -->
-    <add key="BroadcastUrl" value="" />
-    <!-- HTTP broadcasting rate -->
-    <!-- Defines number of seconds to wait before sending next JSON telemetry object (1 minimum, 86400 maximum). -->
-    <add key="BroadcastRate" value="10" />
-    <!-- HTTP broadcasting user ID and password (to be able to identify users on the remote server) -->
-    <!-- These values will be sent as HTTP headers: X-UserId and X-UserPassword as Base64 encoded UTF-8 string values -->
-    <add key="BroadcastUserId" value="User" />
-    <add key="BroadcastUserPassword" value="Password" />
-   
-    <!-- WebApi binding port (it is highly recommended not to change it!) -->
-    <!-- (if you change the port here make sure that you change it inside config.js as well) -->
-    <add key="Port" value="25555" />
-   
-  </appSettings>
-  
-  <log4net>
-    <appender name="FileAppender" type="log4net.Appender.FileAppender">
-      <file value="Ets2Telemetry.log" />
-      <appendToFile value="true" />
-      <encoding value="utf-8" />
-      <staticLogFileName value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date [%-4thread] [%-5level] %message%newline" />
-      </layout>
-    </appender>
-    <root>
-      <level value="INFO" />
-      <appender-ref ref="FileAppender" />
-    </root>
-  </log4net>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-  </startup>  
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
+  </configSections>
+  <appSettings>
+    <!-- ============================================================================== -->
+    <!-- Warning: don't forget to restart the server to reload updated configuration!   -->
+    <!-- ============================================================================== -->
+    <!-- When set to "true" the server will output test telemetry data -->
+    <!-- which is read from the Ets2TestTelemetry.json file. -->
+    <!-- This is very helpful when you create/debug custom skins, -->
+    <!-- because any changes to this json files will be immediately reflected on the dashboard. -->
+    <add key="UseEts2TestTelemetryData" value="false" />
+    <!-- HTTP ETS2/ATS Telemetry broadcasting URL (empty if not used) -->
+    <!-- This URL should accept POST requests containing JSON body. -->
+    <add key="BroadcastUrl" value="" />
+    <!-- HTTP broadcasting rate -->
+    <!-- Defines number of seconds to wait before sending next JSON telemetry object (1 minimum, 86400 maximum). -->
+    <add key="BroadcastRate" value="10" />
+    <!-- HTTP broadcasting user ID and password (to be able to identify users on the remote server) -->
+    <!-- These values will be sent as HTTP headers: X-UserId and X-UserPassword as Base64 encoded UTF-8 string values -->
+    <add key="BroadcastUserId" value="User" />
+    <add key="BroadcastUserPassword" value="Password" />
+    <!-- WebApi binding port (it is highly recommended not to change it!) -->
+    <!-- (if you change the port here make sure that you change it inside config.js as well) -->
+    <add key="Port" value="25555" />
+    <add key="ClientSettingsProvider.ServiceUri" value="" />
+  </appSettings>
+  <log4net>
+    <appender name="FileAppender" type="log4net.Appender.FileAppender">
+      <file value="Ets2Telemetry.log" />
+      <appendToFile value="true" />
+      <encoding value="utf-8" />
+      <staticLogFileName value="true" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date [%-4thread] [%-5level] %message%newline" />
+      </layout>
+    </appender>
+    <root>
+      <level value="INFO" />
+      <appender-ref ref="FileAppender" />
+    </root>
+  </log4net>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+  </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+  <system.web>
+    <membership defaultProvider="ClientAuthenticationMembershipProvider">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+      </providers>
+    </roleManager>
+  </system.web>
+</configuration>
\ No newline at end of file
diff --git a/server/Ets2Telemetry.pdb b/server/Ets2Telemetry.pdb
index edb39698b3bf8725cf04a4d0f91ddeee6d42bd76..6af9f4f7a80406148a00c3e1df822e163769ea69 100644
GIT binary patch
delta 92
zcmZp8!`bkLa{~*P#Cx;*(TofX49?oCw5Q*bbzitrQ?K@l>7UIqTyH`-7f&(P%__OV
b$T-nazu6&SyF&uwk>5D=Y?p~)dLjt`bm$}Q

delta 92
zcmZp8!`bkLa{~*PMAMeL(TofX3~~oH{hu$P>OYAmgxjL}@#f7kTyH`-^AF6v*<5^u
bk#VA<ezQZuc83JUBfoL#*)9{q^h6Q>tLG%L

diff --git a/source/Funbit.Ets.Telemetry.Server/App.config b/source/Funbit.Ets.Telemetry.Server/App.config
index 7e1c494f..190208d6 100644
--- a/source/Funbit.Ets.Telemetry.Server/App.config
+++ b/source/Funbit.Ets.Telemetry.Server/App.config
@@ -1,62 +1,68 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
-  </configSections>
-  
-  <appSettings>
-
-    <!-- ============================================================================== -->
-    <!-- Warning: don't forget to restart the server to reload updated configuration!   -->
-    <!-- ============================================================================== -->
-    
-    <!-- When set to "true" the server will output test telemetry data -->
-    <!-- which is read from the Ets2TestTelemetry.json file. --> 
-    <!-- This is very helpful when you create/debug custom skins, -->
-    <!-- because any changes to this json files will be immediately reflected on the dashboard. -->
-    <add key="UseEts2TestTelemetryData" value="false" />
-
-    <!-- HTTP ETS2/ATS Telemetry broadcasting URL (empty if not used) -->
-    <!-- This URL should accept POST requests containing JSON body. -->
-    <add key="BroadcastUrl" value="" />
-    <!-- HTTP broadcasting rate -->
-    <!-- Defines number of seconds to wait before sending next JSON telemetry object (1 minimum, 86400 maximum). -->
-    <add key="BroadcastRate" value="10" />
-    <!-- HTTP broadcasting user ID and password (to be able to identify users on the remote server) -->
-    <!-- These values will be sent as HTTP headers: X-UserId and X-UserPassword as Base64 encoded UTF-8 string values -->
-    <add key="BroadcastUserId" value="User" />
-    <add key="BroadcastUserPassword" value="Password" />
-   
-    <!-- WebApi binding port (it is highly recommended not to change it!) -->
-    <!-- (if you change the port here make sure that you change it inside config.js as well) -->
-    <add key="Port" value="25555" />
-   
-  </appSettings>
-  
-  <log4net>
-    <appender name="FileAppender" type="log4net.Appender.FileAppender">
-      <file value="Ets2Telemetry.log" />
-      <appendToFile value="true" />
-      <encoding value="utf-8" />
-      <staticLogFileName value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date [%-4thread] [%-5level] %message%newline" />
-      </layout>
-    </appender>
-    <root>
-      <level value="INFO" />
-      <appender-ref ref="FileAppender" />
-    </root>
-  </log4net>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-  </startup>  
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
+  </configSections>
+  <appSettings>
+    <!-- ============================================================================== -->
+    <!-- Warning: don't forget to restart the server to reload updated configuration!   -->
+    <!-- ============================================================================== -->
+    <!-- When set to "true" the server will output test telemetry data -->
+    <!-- which is read from the Ets2TestTelemetry.json file. -->
+    <!-- This is very helpful when you create/debug custom skins, -->
+    <!-- because any changes to this json files will be immediately reflected on the dashboard. -->
+    <add key="UseEts2TestTelemetryData" value="false" />
+    <!-- HTTP ETS2/ATS Telemetry broadcasting URL (empty if not used) -->
+    <!-- This URL should accept POST requests containing JSON body. -->
+    <add key="BroadcastUrl" value="" />
+    <!-- HTTP broadcasting rate -->
+    <!-- Defines number of seconds to wait before sending next JSON telemetry object (1 minimum, 86400 maximum). -->
+    <add key="BroadcastRate" value="10" />
+    <!-- HTTP broadcasting user ID and password (to be able to identify users on the remote server) -->
+    <!-- These values will be sent as HTTP headers: X-UserId and X-UserPassword as Base64 encoded UTF-8 string values -->
+    <add key="BroadcastUserId" value="User" />
+    <add key="BroadcastUserPassword" value="Password" />
+    <!-- WebApi binding port (it is highly recommended not to change it!) -->
+    <!-- (if you change the port here make sure that you change it inside config.js as well) -->
+    <add key="Port" value="25555" />
+    <add key="ClientSettingsProvider.ServiceUri" value="" />
+  </appSettings>
+  <log4net>
+    <appender name="FileAppender" type="log4net.Appender.FileAppender">
+      <file value="Ets2Telemetry.log" />
+      <appendToFile value="true" />
+      <encoding value="utf-8" />
+      <staticLogFileName value="true" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date [%-4thread] [%-5level] %message%newline" />
+      </layout>
+    </appender>
+    <root>
+      <level value="INFO" />
+      <appender-ref ref="FileAppender" />
+    </root>
+  </log4net>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+  </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+  <system.web>
+    <membership defaultProvider="ClientAuthenticationMembershipProvider">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+      </providers>
+    </roleManager>
+  </system.web>
+</configuration>
\ No newline at end of file
diff --git a/source/Funbit.Ets.Telemetry.Server/Funbit.Ets.Telemetry.Server.csproj b/source/Funbit.Ets.Telemetry.Server/Funbit.Ets.Telemetry.Server.csproj
index 2c178574..10751085 100644
--- a/source/Funbit.Ets.Telemetry.Server/Funbit.Ets.Telemetry.Server.csproj
+++ b/source/Funbit.Ets.Telemetry.Server/Funbit.Ets.Telemetry.Server.csproj
@@ -114,6 +114,7 @@
     <Reference Include="System.Web.Cors">
       <HintPath>..\packages\Microsoft.AspNet.Cors.5.0.0\lib\net45\System.Web.Cors.dll</HintPath>
     </Reference>
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Http, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.2\lib\net45\System.Web.Http.dll</HintPath>
diff --git a/source/Funbit.Ets.Telemetry.Server/Properties/AssemblyInfo.cs b/source/Funbit.Ets.Telemetry.Server/Properties/AssemblyInfo.cs
index a96b0735..523183a1 100644
--- a/source/Funbit.Ets.Telemetry.Server/Properties/AssemblyInfo.cs
+++ b/source/Funbit.Ets.Telemetry.Server/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Funbit.Ets.Telemetry.Server")]
+[assembly: AssemblyTitle("Funbit.Ets.kor.Telemetry.Server")]
 [assembly: AssemblyDescription("ETS2/ATS Telemetry Server + Mobile Dashboard")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.2.5.0")]
-[assembly: AssemblyFileVersion("3.2.5.0")]
+[assembly: AssemblyVersion("3.2.5.1")]
+[assembly: AssemblyFileVersion("3.2.5.1")]