[asterisk-addons-commits] russell: trunk r415 - in /trunk: ./ asterisk-ooh323c/src/chan_h323.c

[SVN commits to the Asterisk addons project]

Author: russell
Date: Thu Jul 19 10:13:20 2007
New Revision: 415

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=415
Log:
Merged revisions 414 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/branches/1.4

........
r414 | russell | 2007-07-19 10:12:54 -0500 (Thu, 19 Jul 2007) | 9 lines

fix HOLD and UNHOLD control frame processing to the ooh323 channel driver.
The minimum thing that every channel driver should do with these is start
or stop music on hold on the channel.  Optionally, depending on the channel,
it may make sense to add configuration options to pass this information down
so that the remote end can handle the HOLD signalling in the way that they
choose.  For example, chan_iax2 will pass this signalling across the network,
and chan_zap will pass this signalling on a PRI.
(This fixes a problem I saw on the asterisk-users mailing list)

........

Modified:
    trunk/   (props changed)
    trunk/asterisk-ooh323c/src/chan_h323.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Jul 19 10:13:20 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-299,308,310,317,319,329,342,348,358,380,382,387,389,398,405,410
+/branches/1.4:1-299,308,310,317,319,329,342,348,358,380,382,387,389,398,405,410,414

Modified: trunk/asterisk-ooh323c/src/chan_h323.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/asterisk-ooh323c/src/chan_h323.c?view=diff&rev=415&r1=414&r2=415
==============================================================================
--- trunk/asterisk-ooh323c/src/chan_h323.c (original)
+++ trunk/asterisk-ooh323c/src/chan_h323.c Thu Jul 19 10:13:20 2007
@@ -968,9 +968,16 @@
             ast_set_flag(p, H323_ALREADYGONE);
          }
          break;
+      case AST_CONTROL_HOLD:
+         ast_moh_start(ast, data, NULL);      
+         break;
+      case AST_CONTROL_UNHOLD:
+	     ast_moh_stop(ast);
+         break;
       case AST_CONTROL_PROCEEDING:
       case AST_CONTROL_RINGING:
       case AST_CONTROL_PROGRESS:
+      case -1;
          break;
       default:
          ast_log(LOG_WARNING,"Don't know how to indicate condition %d on %s\n",