From 02ea4b4d34a193d9522e7ff7533430c070474081 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Thu, 11 Sep 2008 17:55:27 +0000
Subject: [PATCH] push progress event up to mod_openzap on analog ring

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@555 a93c3328-9c30-0410-af19-c9cd2b2d52af
---
 libs/openzap/mod_openzap/mod_openzap.c             |  9 +++++++++
 libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.c | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/libs/openzap/mod_openzap/mod_openzap.c b/libs/openzap/mod_openzap/mod_openzap.c
index 9a1ac3423f..ea57d85688 100644
--- a/libs/openzap/mod_openzap/mod_openzap.c
+++ b/libs/openzap/mod_openzap/mod_openzap.c
@@ -1158,6 +1158,15 @@ static ZIO_SIGNAL_CB_FUNCTION(on_fxs_signal)
 			}
 		}
 		break;
+    case ZAP_SIGEVENT_PROGRESS:
+		{
+			if ((session = zap_channel_get_session(sigmsg->channel, 0))) {
+				channel = switch_core_session_get_channel(session);
+				switch_channel_mark_ring_ready(channel);
+				switch_core_session_rwunlock(session);
+			}
+		}
+		break;
     case ZAP_SIGEVENT_START:
 		{
 			zap_clear_flag_locked(sigmsg->channel, ZAP_CHANNEL_HOLD);
diff --git a/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.c b/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.c
index 167c230220..a17d70e85c 100644
--- a/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.c
+++ b/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.c
@@ -477,8 +477,18 @@ static void *zap_analog_channel_run(zap_thread_t *me, void *obj)
 				break;
 			case ZAP_CHANNEL_STATE_GENRING:
 				{
+					zap_sigmsg_t sig;
+
 					send_caller_id(zchan);
 					zap_channel_command(zchan, ZAP_COMMAND_GENERATE_RING_ON, NULL);
+
+					memset(&sig, 0, sizeof(sig));
+					sig.chan_id = zchan->chan_id;
+					sig.span_id = zchan->span_id;
+					sig.channel = zchan;
+					sig.event_id = ZAP_SIGEVENT_PROGRESS;
+					analog_data->sig_cb(&sig);
+					
 				}
 				break;
 			case ZAP_CHANNEL_STATE_GET_CALLERID: