<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16196] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16196">16196</a></dd>
<dt>Author</dt> <dd>verifier</dd>
<dt>Date</dt> <dd>2010-01-07 06:38:20 -0600 (Thu, 07 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some changes to the .net event socket.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribverifierEventSockettrunkEventWatcherEventWatchercsproj">freeswitch/trunk/contrib/verifier/EventSocket/trunk/EventWatcher/EventWatcher.csproj</a></li>
<li><a href="#freeswitchtrunkcontribverifierEventSockettrunkEventWatcherPropertiesResourcesDesignercs">freeswitch/trunk/contrib/verifier/EventSocket/trunk/EventWatcher/Properties/Resources.Designer.cs</a></li>
<li><a href="#freeswitchtrunkcontribverifierEventSockettrunkEventWatcherPropertiesSettingsDesignercs">freeswitch/trunk/contrib/verifier/EventSocket/trunk/EventWatcher/Properties/Settings.Designer.cs</a></li>
<li><a href="#freeswitchtrunkcontribverifierEventSockettrunkFreeSwitchEventSocketTestFreeSwitchEventSocketTestcsproj">freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitch.EventSocket.Test/FreeSwitch.EventSocket.Test.csproj</a></li>
<li><a href="#freeswitchtrunkcontribverifierEventSockettrunkFreeSwitchEventSocketsln">freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitch.EventSocket.sln</a></li>
<li><a href="#freeswitchtrunkcontribverifierEventSockettrunkFreeSwitchEventSocketEventManagercs">freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventManager.cs</a></li>
<li><a href="#freeswitchtrunkcontribverifierEventSockettrunkFreeSwitchEventSocketEventSocketcs">freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.cs</a></li>
<li><a href="#freeswitchtrunkcontribverifierEventSockettrunkFreeSwitchEventSocketFreeSwitchEventSocketcsproj">freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj</a></li>
<li><a href="#freeswitchtrunkcontribverifierEventSockettrunkFreeSwitchEventSocketSipEventsEventPresenceProbecs">freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceProbe.cs</a></li>
<li><a href="#freeswitchtrunkcontribverifierEventSockettrunkIvrSocketIvrSocketcsproj">freeswitch/trunk/contrib/verifier/EventSocket/trunk/IvrSocket/IvrSocket.csproj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribverifierEventSockettrunkEventWatcherEventWatchercsproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/verifier/EventSocket/trunk/EventWatcher/EventWatcher.csproj (16195 => 16196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/verifier/EventSocket/trunk/EventWatcher/EventWatcher.csproj 2010-01-07 06:43:51 UTC (rev 16195)
+++ freeswitch/trunk/contrib/verifier/EventSocket/trunk/EventWatcher/EventWatcher.csproj 2010-01-07 12:38:20 UTC (rev 16196)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</del><ins>+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
</ins><span class="cx"> <PropertyGroup>
</span><span class="cx"> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
</span><span class="cx"> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
</span><span class="lines">@@ -9,6 +9,11 @@
</span><span class="cx"> <AppDesignerFolder>Properties</AppDesignerFolder>
</span><span class="cx"> <RootNamespace>EventWatcher</RootNamespace>
</span><span class="cx"> <AssemblyName>EventWatcher</AssemblyName>
</span><ins>+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>2.0</OldToolsVersion>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</span><span class="cx"> <DebugSymbols>true</DebugSymbols>
</span></span></pre></div>
<a id="freeswitchtrunkcontribverifierEventSockettrunkEventWatcherPropertiesResourcesDesignercs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/verifier/EventSocket/trunk/EventWatcher/Properties/Resources.Designer.cs (16195 => 16196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/verifier/EventSocket/trunk/EventWatcher/Properties/Resources.Designer.cs 2010-01-07 06:43:51 UTC (rev 16195)
+++ freeswitch/trunk/contrib/verifier/EventSocket/trunk/EventWatcher/Properties/Resources.Designer.cs 2010-01-07 12:38:20 UTC (rev 16196)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> //------------------------------------------------------------------------------
</span><span class="cx"> // <auto-generated>
</span><span class="cx"> // This code was generated by a tool.
</span><del>-// Runtime Version:2.0.50727.312
</del><ins>+// Runtime Version:2.0.50727.4016
</ins><span class="cx"> //
</span><span class="cx"> // Changes to this file may cause incorrect behavior and will be lost if
</span><span class="cx"> // the code is regenerated.
</span></span></pre></div>
<a id="freeswitchtrunkcontribverifierEventSockettrunkEventWatcherPropertiesSettingsDesignercs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/verifier/EventSocket/trunk/EventWatcher/Properties/Settings.Designer.cs (16195 => 16196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/verifier/EventSocket/trunk/EventWatcher/Properties/Settings.Designer.cs 2010-01-07 06:43:51 UTC (rev 16195)
+++ freeswitch/trunk/contrib/verifier/EventSocket/trunk/EventWatcher/Properties/Settings.Designer.cs 2010-01-07 12:38:20 UTC (rev 16196)
</span><span class="lines">@@ -1,28 +1,24 @@
</span><span class="cx"> //------------------------------------------------------------------------------
</span><span class="cx"> // <auto-generated>
</span><span class="cx"> // This code was generated by a tool.
</span><del>-// Runtime Version:2.0.50727.312
</del><ins>+// Runtime Version:2.0.50727.4016
</ins><span class="cx"> //
</span><span class="cx"> // Changes to this file may cause incorrect behavior and will be lost if
</span><span class="cx"> // the code is regenerated.
</span><span class="cx"> // </auto-generated>
</span><span class="cx"> //------------------------------------------------------------------------------
</span><span class="cx">
</span><del>-namespace EventWatcher.Properties
-{
-
-
</del><ins>+namespace EventWatcher.Properties {
+
+
</ins><span class="cx"> [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
</span><del>- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
- {
-
</del><ins>+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
</ins><span class="cx"> private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
</span><del>-
- public static Settings Default
- {
- get
- {
</del><ins>+
+ public static Settings Default {
+ get {
</ins><span class="cx"> return defaultInstance;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribverifierEventSockettrunkFreeSwitchEventSocketTestFreeSwitchEventSocketTestcsproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitch.EventSocket.Test/FreeSwitch.EventSocket.Test.csproj (16195 => 16196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitch.EventSocket.Test/FreeSwitch.EventSocket.Test.csproj 2010-01-07 06:43:51 UTC (rev 16195)
+++ freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitch.EventSocket.Test/FreeSwitch.EventSocket.Test.csproj 2010-01-07 12:38:20 UTC (rev 16196)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</del><ins>+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
</ins><span class="cx"> <PropertyGroup>
</span><span class="cx"> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
</span><span class="cx"> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
</span><span class="lines">@@ -9,6 +9,11 @@
</span><span class="cx"> <AppDesignerFolder>Properties</AppDesignerFolder>
</span><span class="cx"> <RootNamespace>FreeSwitch.EventSocket.Test</RootNamespace>
</span><span class="cx"> <AssemblyName>FreeSwitch.EventSocket.Test</AssemblyName>
</span><ins>+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>2.0</OldToolsVersion>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</span><span class="cx"> <DebugSymbols>true</DebugSymbols>
</span></span></pre></div>
<a id="freeswitchtrunkcontribverifierEventSockettrunkFreeSwitchEventSocketsln"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitch.EventSocket.sln (16195 => 16196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitch.EventSocket.sln 2010-01-07 06:43:51 UTC (rev 16195)
+++ freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitch.EventSocket.sln 2010-01-07 12:38:20 UTC (rev 16196)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx">
</span><del>-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
</del><ins>+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
</ins><span class="cx"> Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSwitch.EventSocket", "FreeSwitchEventSocket\FreeSwitch.EventSocket.csproj", "{3F8895F6-F710-4323-B96A-4EFB6BC97E08}"
</span><span class="cx"> EndProject
</span><span class="cx"> Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSwitch.EventSocket.Test", "FreeSwitch.EventSocket.Test\FreeSwitch.EventSocket.Test.csproj", "{3679225D-79A3-4B6C-BCA1-E2DC265E423A}"
</span></span></pre></div>
<a id="freeswitchtrunkcontribverifierEventSockettrunkFreeSwitchEventSocketEventManagercs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventManager.cs (16195 => 16196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventManager.cs 2010-01-07 06:43:51 UTC (rev 16195)
+++ freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventManager.cs 2010-01-07 12:38:20 UTC (rev 16196)
</span><span class="lines">@@ -31,6 +31,11 @@
</span><span class="cx"> private readonly object _logLocker = new object();
</span><span class="cx"> private readonly LogWriterHandler _logWriter;
</span><span class="cx">
</span><ins>+ /// <summary>
+ /// Gets or sets display all missing event types.
+ /// </summary>
+ public bool DisplayMissingEventTypes { get; set; }
+
</ins><span class="cx"> /// <summary>
</span><span class="cx"> /// FreeSWITCH password, default is "ClueCon".
</span><span class="cx"> /// </summary>
</span><span class="lines">@@ -129,7 +134,7 @@
</span><span class="cx"> eb.Parse(parameters);
</span><span class="cx"> EventReceived(eb);
</span><span class="cx"> }
</span><del>- else
</del><ins>+ else if (DisplayMissingEventTypes)
</ins><span class="cx"> _logWriter(LogPrio.Warning, "Failed to load '" + eventName + "'.");
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribverifierEventSockettrunkFreeSwitchEventSocketEventSocketcs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.cs (16195 => 16196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.cs 2010-01-07 06:43:51 UTC (rev 16195)
+++ freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.cs 2010-01-07 12:38:20 UTC (rev 16196)
</span><span class="lines">@@ -131,6 +131,11 @@
</span><span class="cx"> TryConnect();
</span><span class="cx"> LogWriter(LogPrio.Debug, "Connected to freeswitch.");
</span><span class="cx"> }
</span><ins>+ catch(InvalidOperationException err)
+ {
+ LogWriter(LogPrio.Debug, "Failed to connect to freeswitch, reason: " + err.Message);
+ HandleDisconnect();
+ }
</ins><span class="cx"> catch (SocketException err)
</span><span class="cx"> {
</span><span class="cx"> LogWriter(LogPrio.Debug, "Failed to connect to freeswitch, reason: " + err.Message);
</span><span class="lines">@@ -148,12 +153,6 @@
</span><span class="cx">
</span><span class="cx"> Connected(this);
</span><span class="cx"> BeginRead();
</span><del>-
- if (_timer == null) return;
- Timer tmr = _timer;
- _timer = null;
- tmr.Change(Timeout.Infinite, Timeout.Infinite);
- tmr.Dispose();
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -235,15 +234,9 @@
</span><span class="cx"> return;
</span><span class="cx"> if (!_socket.Connected)
</span><span class="cx"> {
</span><del>- try
- {
- TryConnect();
- LogWriter(LogPrio.Info, "We've connected again");
- }
- catch (SocketException)
- {
- return;
- }
</del><ins>+ if (_timer == null)
+ _timer = new Timer(OnTryConnect, null, RetryTimeout, RetryTimeout);
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> byte[] bytes = Encoding.ASCII.GetBytes(s);
</span><span class="lines">@@ -321,12 +314,35 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Disconnected(this);
</span><del>- if (!AutoConnect || _timer != null) return;
</del><ins>+ if (!AutoConnect || _timer != null)
+ return;
+
</ins><span class="cx"> LogWriter(LogPrio.Info, "Launching autoconnect timer.");
</span><del>- _timer = new Timer(TryConnect, this, RetryTimeout, RetryTimeout);
</del><ins>+ _timer = new Timer(OnTryConnect, this, RetryTimeout, RetryTimeout);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- private void RequestEvents()
</del><ins>+ private void OnTryConnect(object state)
+ {
+ try
+ {
+ TryConnect();
+ LogWriter(LogPrio.Info, "Connected again.");
+ if (_timer == null)
+ return;
+
+ Timer tmr = _timer;
+ _timer = null;
+ tmr.Change(Timeout.Infinite, Timeout.Infinite);
+ tmr.Dispose();
+ }
+ catch(Exception err)
+ {
+ if (!(err is SocketException))
+ LogWriter(LogPrio.Error, "Unexpected exception in try connect: " + err);
+ }
+ }
+
+ private void RequestEvents()
</ins><span class="cx"> {
</span><span class="cx"> if (_events.Count <= 0 && _authed)
</span><span class="cx"> return;
</span><span class="lines">@@ -363,17 +379,5 @@
</span><span class="cx"> // All commands need replies.
</span><span class="cx"> Write(command + "\n\n");
</span><span class="cx"> }
</span><del>-
- private void TryConnect(object state)
- {
- EventSocket client = (EventSocket) state;
- try
- {
- client.TryConnect();
- LogWriter(LogPrio.Info, "Connected again.");
- }
- catch (SocketException)
- {}
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="freeswitchtrunkcontribverifierEventSockettrunkFreeSwitchEventSocketFreeSwitchEventSocketcsproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj (16195 => 16196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj 2010-01-07 06:43:51 UTC (rev 16195)
+++ freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj 2010-01-07 12:38:20 UTC (rev 16196)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><del>-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</del><ins>+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
</ins><span class="cx"> <PropertyGroup>
</span><span class="cx"> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
</span><span class="cx"> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
</span><del>- <ProductVersion>8.0.50727</ProductVersion>
</del><ins>+ <ProductVersion>9.0.30729</ProductVersion>
</ins><span class="cx"> <SchemaVersion>2.0</SchemaVersion>
</span><span class="cx"> <ProjectGuid>{3F8895F6-F710-4323-B96A-4EFB6BC97E08}</ProjectGuid>
</span><span class="cx"> <OutputType>Library</OutputType>
</span><span class="lines">@@ -13,6 +13,26 @@
</span><span class="cx"> </StartupObject>
</span><span class="cx"> <SignAssembly>true</SignAssembly>
</span><span class="cx"> <AssemblyOriginatorKeyFile>EventSocket.pfx</AssemblyOriginatorKeyFile>
</span><ins>+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>2.0</OldToolsVersion>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</span><span class="cx"> <DebugSymbols>true</DebugSymbols>
</span><span class="lines">@@ -114,6 +134,33 @@
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="EventSocket.pfx" />
</span><span class="cx"> </ItemGroup>
</span><ins>+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</ins><span class="cx"> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</span><span class="cx"> <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
</span><span class="cx"> Other similar extension points exist, see Microsoft.Common.targets.
</span></span></pre></div>
<a id="freeswitchtrunkcontribverifierEventSockettrunkFreeSwitchEventSocketSipEventsEventPresenceProbecs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceProbe.cs (16195 => 16196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceProbe.cs 2010-01-07 06:43:51 UTC (rev 16195)
+++ freeswitch/trunk/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceProbe.cs 2010-01-07 12:38:20 UTC (rev 16196)
</span><span class="lines">@@ -1,16 +1,52 @@
</span><del>-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace FreeSwitch.EventSocket.SipEvents
</del><ins>+namespace FreeSwitch.EventSocket
</ins><span class="cx"> {
</span><del>- class EventPresenceProbe : EventPresence
- {
- public override string ToString()
- {
- return "PresenceProbe." + base.ToString();
- }
</del><ins>+ /// <summary>
+ ///
+ /// </summary>
+ /// <example>
+ /// proto: sip
+/// login: sip%3Amod_sofia%4010.0.1.250%3A5060
+/// from: 1009%4010.0.1.250
+/// status: Available
+/// event_type: presence
+/// event_subtype: probe
+/// proto-specific-event-name: dialog
+/// Event-Name: PRESENCE_PROBE
+/// Core-UUID: 2130a7d1-c1f7-44cd-8fae-8ed5946f3cec
+/// FreeSWITCH-Hostname: localhost.localdomain
+/// FreeSWITCH-IPv4: 10.0.1.250
+/// FreeSWITCH-IPv6: 127.0.0.1
+/// Event-Date-Local: 2007-12-16%2022%3A31%3A16
+/// Event-Date-GMT: Mon,%2017%20Dec%202007%2004%3A31%3A16%20GMT
+/// Event-Date-timestamp: 1197865876565022
+/// Event-Calling-File: sofia_presence.c
+/// Event-Calling-Function: sofia_presence_sub_reg_callback
+ /// Event-Calling-Line-Number: 484
+ /// </example>
+ public class EventPresenceProbe : SipEvent
+ {
+ /// <summary>
+ /// Gets or sets user status.
+ /// </summary>
+ public string Status { get; set; }
</ins><span class="cx">
</span><del>- }
</del><ins>+ /// <summary>
+ /// Gets or sets login module used.
+ /// </summary>
+ public string Login { get; set; }
</ins><span class="cx">
</span><ins>+ public override bool ParseCommand(string name, string value)
+ {
+ switch (name)
+ {
+ case "status":
+ Status = value;
+ break;
+ case "login":
+ Login = value;
+ break;
+ }
+ return true;
+ }
+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribverifierEventSockettrunkIvrSocketIvrSocketcsproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/verifier/EventSocket/trunk/IvrSocket/IvrSocket.csproj (16195 => 16196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/verifier/EventSocket/trunk/IvrSocket/IvrSocket.csproj 2010-01-07 06:43:51 UTC (rev 16195)
+++ freeswitch/trunk/contrib/verifier/EventSocket/trunk/IvrSocket/IvrSocket.csproj 2010-01-07 12:38:20 UTC (rev 16196)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</del><ins>+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
</ins><span class="cx"> <PropertyGroup>
</span><span class="cx"> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
</span><span class="cx"> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
</span><span class="lines">@@ -9,6 +9,11 @@
</span><span class="cx"> <AppDesignerFolder>Properties</AppDesignerFolder>
</span><span class="cx"> <RootNamespace>IvrSocket</RootNamespace>
</span><span class="cx"> <AssemblyName>IvrSocket</AssemblyName>
</span><ins>+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>2.0</OldToolsVersion>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</span><span class="cx"> <DebugSymbols>true</DebugSymbols>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>