[svn-commits] tilghman: branch 1.4 r601 - /branches/1.4/channels/chan_ooh323.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed May 28 09:42:48 2008
New Revision: 601

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=601
Log:
Bring 1.4 up to date
(related to issue #12715)
 Reported by: softins
 Patches: 
       ooh323-1.4-diff.txt uploaded by softins (license 197)

Modified:
    branches/1.4/channels/chan_ooh323.c

Modified: branches/1.4/channels/chan_ooh323.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/channels/chan_ooh323.c?view=diff&rev=601&r1=600&r2=601
==============================================================================
--- branches/1.4/channels/chan_ooh323.c (original)
+++ branches/1.4/channels/chan_ooh323.c Wed May 28 09:42:48 2008
@@ -82,10 +82,10 @@
 };
 
 static struct ast_rtp_protocol ooh323_rtp = {
-   type: type,
-   get_rtp_info: ooh323_get_rtp_peer,
-   get_vrtp_info: ooh323_get_vrtp_peer,
-   set_rtp_peer: ooh323_set_rtp_peer
+   .type = type,
+   .get_rtp_info = ooh323_get_rtp_peer,
+   .get_vrtp_info = ooh323_get_vrtp_peer,
+   .set_rtp_peer = ooh323_set_rtp_peer
 };
 
 /* H.323 channel private structure */
@@ -749,7 +749,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)
@@ -962,7 +961,7 @@
       fr = ooh323_rtp_read(ast, p);
    else
       fr = &null_frame;
-   //   time(&p->lastrtprx);
+   /* time(&p->lastrtprx); */
    ast_mutex_unlock(&p->lock);
    return fr;
 }
@@ -1931,7 +1930,7 @@
          char* endlimit = 0;
          char temp[512];
          strncpy(temp, v->value, sizeof(temp) - 1);	
-      	//char *temp = ast_strdupa(v->value);
+      	/* char *temp = ast_strdupa(v->value); */
          endlimit = strchr(temp, ',');
          if (endlimit) {
             *endlimit = '\0';
@@ -1945,7 +1944,7 @@
             }
          } 
          else {
-            ast_log(LOG_ERROR, "h225portrange: Invalid format, seperate port range with \",\"\n");
+            ast_log(LOG_ERROR, "h225portrange: Invalid format, separate port range with \",\"\n");
          }
       }
       else if (!strcasecmp(v->name, "gateway")) {
@@ -2105,7 +2104,7 @@
          utype = ast_variable_retrieve(cfg, cat, "type");
          if(utype)
          {
-		 friend_type = strcasecmp(utype, "friend");
+            friend_type = strcasecmp(utype, "friend");
             if(!strcmp(utype, "user") || 0 == friend_type)
             {
                user = build_user(cat, ast_variable_browse(cfg, cat));
@@ -2397,8 +2396,6 @@
    ast_cli(fd, "%-20s%s\n", "CallerId", gCallerID);
    ast_cli(fd, "%-20s%s\n", "MediaWaitForConnect", 
       gMediaWaitForConnect?"yes":"no");
-   ast_cli(fd, "%-15s%s\n", "MediaWaitForConnect", 
-      gMediaWaitForConnect?"yes":"no");
 
 #if (0)
    extern OOH323EndPoint gH323ep;
@@ -2548,7 +2545,7 @@
    peerl.peers = NULL;
    ast_mutex_init(&peerl.lock);
          
-   //ast_register_atexit(&ast_ooh323c_exit);
+   /* ast_register_atexit(&ast_ooh323c_exit); */
 
    sched = sched_context_create();
    if (!sched) {
@@ -2698,6 +2695,7 @@
    time_t t;
 
    for(;;) {
+      struct ooh323_pvt *h323_next;
       /* Check for a reload request */
       ast_mutex_lock(&h323_reload_lock);
       reloading = h323_reloading;
@@ -2712,7 +2710,6 @@
 
       /* Check for interfaces needing to be killed */
       ast_mutex_lock(&iflock);
-      struct ooh323_pvt *h323_next;
       time(&t);
       h323 = iflist;
       while(h323) {
@@ -2932,7 +2929,7 @@
    ast_cli_unregister(&cli_no_debug);
    ast_rtp_proto_unregister(&ooh323_rtp);
    ast_channel_unregister(&ooh323_tech);
-   //ast_unregister_atexit(&ast_ooh323c_exit);
+   /* ast_unregister_atexit(&ast_ooh323c_exit); */
 
    if(gH323Debug) {
       ast_verbose("  unload_module - hanging up all interfaces\n");
@@ -3212,7 +3209,7 @@
    }
 
    them.sin_family = AF_INET;
-   them.sin_addr.s_addr = inet_addr(remoteIp); // only works for IPv4
+   them.sin_addr.s_addr = inet_addr(remoteIp); /* only works for IPv4 */
    them.sin_port = htons(remotePort);
    ast_rtp_set_peer(p->rtp, &them);
 
@@ -3323,14 +3320,12 @@
             ast_set_read_format(p->owner, p->owner->readformat);
             ast_set_write_format(p->owner, p->owner->writeformat);
          }
-#if 0
          if ((p->dtmfmode & H323_DTMF_INBAND) && p->vad) 
          {
             f = ast_dsp_process(p->owner, p->vad, f);
             if (f && (f->frametype == AST_FRAME_DTMF)) 
                ast_log(LOG_DEBUG, "* Detected inband DTMF '%c'\n",f->subclass);
          }
-#endif
       }
    }
    return f;
@@ -3395,9 +3390,11 @@
    return 0;
 }
 
+#if 0
 void ast_ooh323c_exit()
 {
    ooGkClientDestroy();
 }
+#endif
 
 AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Objective Systems H323 Channel");