[asterisk-addons-commits] qwell: branch 1.6.0 r591 - in /branches/1.6.0: ./ channels/

[SVN commits to the Asterisk addons project]

Author: qwell
Date: Mon May  5 11:57:09 2008
New Revision: 591

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=591
Log:
Merged revisions 590 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/trunk

........
r590 | qwell | 2008-05-05 11:50:05 -0500 (Mon, 05 May 2008) | 1 line

Allow chan_ooh323 to build under dev-mode
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_ooh323.c
    branches/1.6.0/channels/ooh323cDriver.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Mon May  5 11:57:09 2008
@@ -1,1 +1,1 @@
-/trunk:540-559,575,579,583,586,588
+/trunk:540-559,575,579,583,586,588,590

Modified: branches/1.6.0/channels/chan_ooh323.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.6.0/channels/chan_ooh323.c?view=diff&rev=591&r1=590&r2=591
==============================================================================
--- branches/1.6.0/channels/chan_ooh323.c (original)
+++ branches/1.6.0/channels/chan_ooh323.c Mon May  5 11:57:09 2008
@@ -59,8 +59,10 @@
                              struct ast_rtp *vrtp, struct ast_rtp *trtp, int codecs, int nat_active);
 
 static void print_codec_to_cli(int fd, struct ast_codec_pref *pref);
+
+#if 0
 static void ast_ooh323c_exit();
-
+#endif
 
 static const struct ast_channel_tech ooh323_tech = {
    .type = type,
@@ -677,7 +679,6 @@
 
 static int ooh323_digit_end(struct ast_channel *chan, char digit, unsigned int duration)
 {
-   char dtmf[2];
    struct ooh323_pvt *p = (struct ooh323_pvt *) chan->tech_pvt;
 
    if(gH323Debug)
@@ -1138,13 +1139,13 @@
   * Callback for sending digits from H.323 up to asterisk
   *
   */
-int ooh323_onReceivedDigit(OOH323CallData *call, const char* digit)
+int ooh323_onReceivedDigit(OOH323CallData *call, const char *digit)
 {
    struct ooh323_pvt *p=NULL;
    struct ast_frame f;
    int res;
 
-   ast_debug(1, "Received Digit: %c\n", digit);
+   ast_debug(1, "Received Digit: %c\n", digit[0]);
    p = find_call(call);
    if(!p) {
       ast_log(LOG_ERROR, "Failed to find a matching call.\n");
@@ -1482,6 +1483,7 @@
    return OO_OK;
 }
 
+#if 0
 static void ooh323_delete_user(struct ooh323_user *user)
 {
    struct ooh323_user *prev=NULL, *cur=NULL;
@@ -1516,6 +1518,7 @@
       ast_verbose("+++   ooh323_delete_user\n");
 
 }
+#endif
 
 void ooh323_delete_peer(struct ooh323_peer *peer)
 {
@@ -1757,6 +1760,7 @@
    return 0;
 }
 
+#if 0
 /*--- h323_reload: Force reload of module from cli ---*/
 static int ooh323_reload(int fd, int argc, char *argv[])
 {
@@ -1779,11 +1783,14 @@
 
    return 0;
 }
-
+#endif
+
+#if 0
 static int reload(void *mod)
 {
    return ooh323_reload(0, 0, NULL);
 }
+#endif
 
 int reload_config(int reload)
 {
@@ -2301,10 +2308,12 @@
 	return CLI_SUCCESS;
 }
 
+#if 0
 static int ooh323_show_channels(int fd, int argc, char *argv[])
 {
    return RESULT_SUCCESS;
 }
+#endif
 
 static char *handle_cli_ooh323_show_config(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
@@ -2430,8 +2439,10 @@
    ast_mutex_init(&userl.lock);
    peerl.peers = NULL;
    ast_mutex_init(&peerl.lock);
-         
-   //ast_register_atexit(&ast_ooh323c_exit);
+ 
+#if 0      
+   ast_register_atexit(&ast_ooh323c_exit);
+#endif
 
    sched = sched_context_create();
    if (!sched) {
@@ -2575,6 +2586,7 @@
    time_t t;
 
    for(;;) {
+      struct ooh323_pvt *h323_next;
       /* Check for a reload request */
       ast_mutex_lock(&h323_reload_lock);
       reloading = h323_reloading;
@@ -2588,7 +2600,6 @@
       }
       /* Check for interfaces needing to be killed */
       ast_mutex_lock(&iflock);
-      struct ooh323_pvt *h323_next;
       time(&t);
       h323 = iflist;
       while(h323) {
@@ -2783,7 +2794,10 @@
    ast_cli_unregister_multiple(cli_ooh323, sizeof(cli_ooh323) / sizeof(struct ast_cli_entry));
    ast_rtp_proto_unregister(&ooh323_rtp);
    ast_channel_unregister(&ooh323_tech);
-   //ast_unregister_atexit(&ast_ooh323c_exit);
+
+#if 0
+   ast_unregister_atexit(&ast_ooh323c_exit);
+#endif
 
    if(gH323Debug) {
       ast_verbose("  unload_module - hanging up all interfaces\n");
@@ -3242,9 +3256,11 @@
    return 0;
 }
 
+#if 0
 void ast_ooh323c_exit()
 {
    ooGkClientDestroy();
 }
+#endif
 
 AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Objective Systems H323 Channel");

Modified: branches/1.6.0/channels/ooh323cDriver.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.6.0/channels/ooh323cDriver.c?view=diff&rev=591&r1=590&r2=591
==============================================================================
--- branches/1.6.0/channels/ooh323cDriver.c (original)
+++ branches/1.6.0/channels/ooh323cDriver.c Mon May  5 11:57:09 2008
@@ -148,7 +148,7 @@
 int ooh323c_set_capability_for_call
    (ooCallData *call, struct ast_codec_pref *prefs, int capability, int dtmf)
 {
-   int ret, x, txframes, rxframes;
+   int ret, x, txframes;
    int format=0;
    if(gH323Debug)
      ast_verbose("\tAdding capabilities to call(%s, %s)\n", call->callType, 
@@ -324,7 +324,7 @@
       case OO_G7231:
          return AST_FORMAT_G723_1;
       default:
-         ast_debug(1, "Cap %d is not supported by driver yet\n");
+         ast_debug(1, "Cap %d is not supported by driver yet\n", cap);
          return -1;
    }