snow/asternet
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Browse source
This commit is contained in:
skrusty_cp 2013-03-15 12:26:36 -07:00
parent 236f6af81e
commit e930f0bb31
3 changed files with 68 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Asterisk.2013/Asterisk.NET/Manager/Event/DTMFEvent.cs
View file

@ -4,7 +4,7 @@ using System.Text;
namespace Asterisk.NET.Manager.Event namespace Asterisk.NET.Manager.Event
{ {
class DTMFEvent : ManagerEvent public class DTMFEvent : ManagerEvent
{ {
private string digit; private string digit;
private string direction; private string direction;

53
Asterisk.2013/Asterisk.NET/Manager/ManagerConnection.cs
View file

@ -30,9 +30,11 @@ namespace Asterisk.NET.Manager
public delegate void AgentsEventHandler(object sender, Event.AgentsEvent e); public delegate void AgentsEventHandler(object sender, Event.AgentsEvent e);
public delegate void AlarmClearEventHandler(object sender, Event.AlarmClearEvent e); public delegate void AlarmClearEventHandler(object sender, Event.AlarmClearEvent e);
public delegate void AlarmEventHandler(object sender, Event.AlarmEvent e); public delegate void AlarmEventHandler(object sender, Event.AlarmEvent e);
public delegate void BridgeEventHandler(object sender, Event.BridgeEvent e);
public delegate void CdrEventHandler(object sender, Event.CdrEvent e); public delegate void CdrEventHandler(object sender, Event.CdrEvent e);
public delegate void DBGetResponseEventHandler(object sender, Event.DBGetResponseEvent e); public delegate void DBGetResponseEventHandler(object sender, Event.DBGetResponseEvent e);
public delegate void DialEventHandler(object sender, Event.DialEvent e); public delegate void DialEventHandler(object sender, Event.DialEvent e);
public delegate void DTMFEventHandler(object sender, Event.DTMFEvent e);
public delegate void DNDStateEventHandler(object sender, Event.DNDStateEvent e); public delegate void DNDStateEventHandler(object sender, Event.DNDStateEvent e);
public delegate void ExtensionStatusEventHandler(object sender, Event.ExtensionStatusEvent e); public delegate void ExtensionStatusEventHandler(object sender, Event.ExtensionStatusEvent e);
public delegate void HangupEventHandler(object sender, Event.HangupEvent e); public delegate void HangupEventHandler(object sender, Event.HangupEvent e);
@ -68,12 +70,14 @@ namespace Asterisk.NET.Manager
public delegate void QueueStatusCompleteEventHandler(object sender, Event.QueueStatusCompleteEvent e); public delegate void QueueStatusCompleteEventHandler(object sender, Event.QueueStatusCompleteEvent e);
public delegate void RegistryEventHandler(object sender, Event.RegistryEvent e); public delegate void RegistryEventHandler(object sender, Event.RegistryEvent e);
public delegate void RenameEventHandler(object sender, Event.RenameEvent e); public delegate void RenameEventHandler(object sender, Event.RenameEvent e);
public delegate void TransferEventHandler(object sender, Event.TransferEvent e);
public delegate void StatusCompleteEventHandler(object sender, Event.StatusCompleteEvent e); public delegate void StatusCompleteEventHandler(object sender, Event.StatusCompleteEvent e);
public delegate void StatusEventHandler(object sender, Event.StatusEvent e); public delegate void StatusEventHandler(object sender, Event.StatusEvent e);
public delegate void UnholdEventHandler(object sender, Event.UnholdEvent e); public delegate void UnholdEventHandler(object sender, Event.UnholdEvent e);
public delegate void UnlinkEventHandler(object sender, Event.UnlinkEvent e); public delegate void UnlinkEventHandler(object sender, Event.UnlinkEvent e);
public delegate void UnparkedCallEventHandler(object sender, Event.UnparkedCallEvent e); public delegate void UnparkedCallEventHandler(object sender, Event.UnparkedCallEvent e);
public delegate void UserEventHandler(object sender, Event.UserEvent e); public delegate void UserEventHandler(object sender, Event.UserEvent e);
public delegate void QueueCallerAbandonEventHandler(object sender, Event.QueueCallerAbandonEvent e);
public delegate void ZapShowChannelsCompleteEventHandler(object sender, Event.ZapShowChannelsCompleteEvent e); public delegate void ZapShowChannelsCompleteEventHandler(object sender, Event.ZapShowChannelsCompleteEvent e);
public delegate void ZapShowChannelsEventHandler(object sender, Event.ZapShowChannelsEvent e); public delegate void ZapShowChannelsEventHandler(object sender, Event.ZapShowChannelsEvent e);
public delegate void ConnectionStateEventHandler(object sender, Event.ConnectionStateEvent e); public delegate void ConnectionStateEventHandler(object sender, Event.ConnectionStateEvent e);
@ -191,6 +195,10 @@ namespace Asterisk.NET.Manager
/// An AlarmEvent is triggered when a Zap channel leaves alarm state. /// An AlarmEvent is triggered when a Zap channel leaves alarm state.
/// </summary> /// </summary>
public event AlarmClearEventHandler AlarmClear; public event AlarmClearEventHandler AlarmClear;
/// <summary>
///
/// </summary>
public event BridgeEventHandler Bridge;
/// <summary> /// <summary>
/// An AlarmEvent is triggered when a Zap channel enters or changes alarm state. /// An AlarmEvent is triggered when a Zap channel enters or changes alarm state.
/// </summary> /// </summary>
@ -204,6 +212,7 @@ namespace Asterisk.NET.Manager
/// A Dial is triggered whenever a phone attempts to dial someone.<br/> /// A Dial is triggered whenever a phone attempts to dial someone.<br/>
/// </summary> /// </summary>
public event DialEventHandler Dial; public event DialEventHandler Dial;
public event DTMFEventHandler DTMF;
/// <summary> /// <summary>
/// A DNDStateEvent is triggered by the Zap channel driver when a channel enters or leaves DND (do not disturb) state. /// A DNDStateEvent is triggered by the Zap channel driver when a channel enters or leaves DND (do not disturb) state.
/// </summary> /// </summary>
@ -319,6 +328,10 @@ namespace Asterisk.NET.Manager
/// A PeerStatus is triggered when a SIP or IAX client attempts to registrer at this asterisk server.<br/> /// A PeerStatus is triggered when a SIP or IAX client attempts to registrer at this asterisk server.<br/>
/// </summary> /// </summary>
public event PeerStatusEventHandler PeerStatus; public event PeerStatusEventHandler PeerStatus;
/// <summary>
/// A QueueEntryEvent is triggered in response to a QueueStatusAction and contains information about an entry in a queue.
/// </summary>
public event QueueCallerAbandonEventHandler QueueCallerAbandon;
/// <summary> /// <summary>
/// A QueueEntryEvent is triggered in response to a QueueStatusAction and contains information about an entry in a queue. /// A QueueEntryEvent is triggered in response to a QueueStatusAction and contains information about an entry in a queue.
/// </summary> /// </summary>
@ -368,6 +381,10 @@ namespace Asterisk.NET.Manager
/// A StatusEvent is triggered for each active channel in response to a StatusAction. /// A StatusEvent is triggered for each active channel in response to a StatusAction.
/// </summary> /// </summary>
public event StatusEventHandler Status; public event StatusEventHandler Status;
/// <summary>
///
/// </summary>
public event TransferEventHandler Transfer;
/// <summary> /// <summary>
/// An UnholdEvent is triggered by the SIP channel driver when a channel is no longer put on hold. /// An UnholdEvent is triggered by the SIP channel driver when a channel is no longer put on hold.
/// </summary> /// </summary>
@ -468,7 +485,7 @@ namespace Asterisk.NET.Manager
Helper.RegisterEventHandler(registeredEventHandlers, 48, typeof(QueueParamsEvent)); Helper.RegisterEventHandler(registeredEventHandlers, 48, typeof(QueueParamsEvent));
Helper.RegisterEventHandler(registeredEventHandlers, 49, typeof(QueueStatusCompleteEvent)); Helper.RegisterEventHandler(registeredEventHandlers, 49, typeof(QueueStatusCompleteEvent));
Helper.RegisterEventHandler(registeredEventHandlers, 50, typeof(RegistryEvent)); Helper.RegisterEventHandler(registeredEventHandlers, 50, typeof(RegistryEvent));
Helper.RegisterEventHandler(registeredEventHandlers, 51, typeof(QueueCallerAbandonEvent));
Helper.RegisterEventHandler(registeredEventHandlers, 52, typeof(RenameEvent)); Helper.RegisterEventHandler(registeredEventHandlers, 52, typeof(RenameEvent));
Helper.RegisterEventHandler(registeredEventHandlers, 54, typeof(StatusCompleteEvent)); Helper.RegisterEventHandler(registeredEventHandlers, 54, typeof(StatusCompleteEvent));
@ -485,6 +502,10 @@ namespace Asterisk.NET.Manager
Helper.RegisterEventHandler(registeredEventHandlers, 62, typeof(ReloadEvent)); Helper.RegisterEventHandler(registeredEventHandlers, 62, typeof(ReloadEvent));
Helper.RegisterEventHandler(registeredEventHandlers, 62, typeof(ShutdownEvent)); Helper.RegisterEventHandler(registeredEventHandlers, 62, typeof(ShutdownEvent));
Helper.RegisterEventHandler(registeredEventHandlers, 63, typeof(BridgeEvent));
Helper.RegisterEventHandler(registeredEventHandlers, 64, typeof(TransferEvent));
Helper.RegisterEventHandler(registeredEventHandlers, 65, typeof(DTMFEvent));
#endregion #endregion
@ -933,6 +954,13 @@ namespace Asterisk.NET.Manager
return; return;
} }
break; break;
case 51:
if (QueueCallerAbandon != null)
{
QueueCallerAbandon(this, (QueueCallerAbandonEvent)e);
return;
}
break;
case 52: case 52:
if (Rename != null) if (Rename != null)
{ {
@ -1005,6 +1033,24 @@ namespace Asterisk.NET.Manager
return; return;
} }
break; break;
case 63:
if (Bridge != null)
{
Bridge(this, (BridgeEvent)e);
}
break;
case 64:
if (Transfer != null)
{
Transfer(this, (TransferEvent)e);
}
break;
case 65:
if (DTMF != null)
{
DTMF(this, (DTMFEvent)e);
}
break;
default: default:
if (UnhandledEvent != null) if (UnhandledEvent != null)
@ -1979,7 +2025,7 @@ namespace Asterisk.NET.Manager
if (response != null) if (response != null)
actionId = response.ActionId; actionId = response.ActionId;
if (!string.IsNullOrEmpty(actionId)) if (!string.IsNullOrEmpty(actionId))
{ {
int hash = Helper.GetInternalActionId(actionId).GetHashCode(); int hash = Helper.GetInternalActionId(actionId).GetHashCode();
responseActionId = Helper.StripInternalActionId(actionId); responseActionId = Helper.StripInternalActionId(actionId);
@ -2013,7 +2059,8 @@ namespace Asterisk.NET.Manager
} }
} }
} }
else if (response == null && buffer.ContainsKey("ping") && buffer["ping"] == "Pong")
if (response == null && buffer.ContainsKey("ping") && buffer["ping"] == "Pong")
{ {
response = Helper.BuildResponse(buffer); response = Helper.BuildResponse(buffer);
foreach (ResponseHandler pingHandler in pingHandlers.Values) foreach (ResponseHandler pingHandler in pingHandlers.Values)

35
Asterisk.2013/Asterisk.NET/Manager/ManagerReader.cs
View file

@ -209,24 +209,23 @@ namespace Asterisk.NET.Manager
} }
if (lineQueue.Count == 0) if (lineQueue.Count == 0)
{ {
if (mrConnector.PingInterval > 0 if (lastPacketTime.AddMilliseconds(mrConnector.PingInterval) < DateTime.Now
&& mrSocket != null && mrConnector.PingInterval > 0
&& !wait4identiier && mrSocket != null
&& !is_logoff && !wait4identiier
&& lastPacketTime.AddMilliseconds(mrConnector.PingInterval) < DateTime.Now && !is_logoff
) )
{ {
if (pingHandler != null) if (pingHandler != null)
{ {
// In 1.6.0 no Response from Ping if (pingHandler.Response == null)
if (pingHandler.Response == null) {
{ // If one PingInterval from Ping without Pong then send Disconnect event
// If one PingInterval from Ping without Pong then send Disconnect event mrConnector.RemoveResponseHandler(pingHandler);
mrConnector.DispatchEvent(new DisconnectEvent(mrConnector)); mrConnector.DispatchEvent(new DisconnectEvent(mrConnector));
} }
pingHandler.Free(); pingHandler.Free();
mrConnector.RemoveResponseHandler(pingHandler); pingHandler = null;
pingHandler = null;
} }
else else
{ {