[asterisk-addons-commits] objsys: branch 1.4 r331 - in
/branches/1.4: ./ asterisk-ooh323c/ asterisk-ooh...
asterisk-addons-commits at lists.digium.com
asterisk-addons-commits at lists.digium.com
Fri Jan 19 15:27:06 MST 2007
Author: objsys
Date: Fri Jan 19 16:27:05 2007
New Revision: 331
URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=331
Log:
Merged revisions 305-307,324-328 via svnmerge from
https://origsvn.digium.com/svn/asterisk-addons/branches/1.2
........
r305 | objsys | 2006-09-21 17:10:25 -0400 (Thu, 21 Sep 2006) | 1 line
log update
........
r306 | objsys | 2006-09-21 17:11:32 -0400 (Thu, 21 Sep 2006) | 1 line
log update
........
r307 | objsys | 2006-09-21 17:17:58 -0400 (Thu, 21 Sep 2006) | 1 line
added additional trace message to find channel compare problem
........
r324 | objsys | 2007-01-18 16:52:04 -0500 (Thu, 18 Jan 2007) | 1 line
fix for log file msg problem
........
r325 | objsys | 2007-01-18 18:06:36 -0500 (Thu, 18 Jan 2007) | 1 line
Tunneling has priority than control channel
........
r326 | objsys | 2007-01-18 18:14:28 -0500 (Thu, 18 Jan 2007) | 1 line
update for config file
........
r327 | objsys | 2007-01-19 10:14:40 -0500 (Fri, 19 Jan 2007) | 1 line
h263 video codec cap
........
r328 | objsys | 2007-01-19 10:32:52 -0500 (Fri, 19 Jan 2007) | 1 line
other updates
........
Modified:
branches/1.4/ (props changed)
branches/1.4/asterisk-ooh323c/ChangeLog
branches/1.4/asterisk-ooh323c/README
branches/1.4/asterisk-ooh323c/h323.conf.sample
branches/1.4/asterisk-ooh323c/ooh323c/src/ooCapability.c
branches/1.4/asterisk-ooh323c/ooh323c/src/ooLogChan.c
branches/1.4/asterisk-ooh323c/ooh323c/src/ooh323.c
branches/1.4/asterisk-ooh323c/ooh323c/src/ooq931.c
branches/1.4/asterisk-ooh323c/src/chan_h323.c
branches/1.4/asterisk-ooh323c/src/ooh323cDriver.c
Propchange: branches/1.4/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Fri Jan 19 16:27:05 2007
@@ -1,1 +1,1 @@
-/branches/1.2:1-183,209,211,257-258,264,268-273,316
+/branches/1.2:1-183,209,211,257-258,264,268-273,305-328
Modified: branches/1.4/asterisk-ooh323c/ChangeLog
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/asterisk-ooh323c/ChangeLog?view=diff&rev=331&r1=330&r2=331
==============================================================================
--- branches/1.4/asterisk-ooh323c/ChangeLog (original)
+++ branches/1.4/asterisk-ooh323c/ChangeLog Fri Jan 19 16:27:05 2007
@@ -1,18 +1,19 @@
SVN Branch:
* Fixed crash for call transfer caused by channel ownership change.
Thanks to Flagman <Flagman at incomtel.ru>
+* Fixed occasional improper call hangup warning, bug# 7464
Release 0.5
* Includes changes of ooh323c stack 0.8.2 version
1. Used rand number for conference id, Thanks to Patrick Jordan
(Fixes mapping all calls from the same origin number to the destination
of the first call for H323 gatekeeper (Quintum Voicemaster))
- 2. Fixed bug for codec type comparision, Thanks to Legostayev Denis
+ 2. Fixed bug for codec type comparison, Thanks to Legostayev Denis
3. Fixed "#*," digits bug for dialedDigit & callerID, Thanks to Vlasis
Hatzistavrou
4. Added ETC for call hold, Thanks to Dan Austin
5. Fixed bug causing core dump for manual ringback in cleared call
- 6. Added G.728 audio codec negotation support, Thanks to Aleksandar Sutic
+ 6. Added G.728 audio codec negotiation support, Thanks to Aleksandar Sutic
* Fixed bug causing core dump for receive digit, for channel without owner
* Fixed bug causing core dump for obtaining lock on clearing call owner
@@ -20,7 +21,7 @@
Release 0.4
* Fixed 4 deadlocks conditions in onAlerting, onReceivedDigit and
- onCallExstablished funtions
+ onCallExstablished functions
* Added Thread/Mutex debugging option, for debug build
* Fixed bug causing dialed digits alias being set as a char string
* Include changes of ooh323c stack 0.8.1 version
Modified: branches/1.4/asterisk-ooh323c/README
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/asterisk-ooh323c/README?view=diff&rev=331&r1=330&r2=331
==============================================================================
--- branches/1.4/asterisk-ooh323c/README (original)
+++ branches/1.4/asterisk-ooh323c/README Fri Jan 19 16:27:05 2007
@@ -25,7 +25,7 @@
you have to have latest version of asterisk installed on your system.
You can skip to step 2, if you have already installed the asterisk.
- Following precedure help you download and install asterisk 1.2.x
+ Following procedure help you download and install asterisk 1.2.x
To get latest asterisk sources from svn branch 1.2:
>svn checkout http://svn.digium.com/svn/asterisk/branches/1.2 asterisk-1.2
Modified: branches/1.4/asterisk-ooh323c/h323.conf.sample
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/asterisk-ooh323c/h323.conf.sample?view=diff&rev=331&r1=330&r2=331
==============================================================================
--- branches/1.4/asterisk-ooh323c/h323.conf.sample (original)
+++ branches/1.4/asterisk-ooh323c/h323.conf.sample Fri Jan 19 16:27:05 2007
@@ -31,45 +31,47 @@
[general]
-;Define the asetrisk server h323 endpoint
+;Define the asterisk server h323 endpoint
;The port asterisk should listen for incoming H323 connections.
;Default - 1720
;port=1720
-;The dotted IP address asterisk should listen on for incoming H323
+;The IP address, asterisk should listen on for incoming H323
;connections
-;Default - tries to find out local ip address on it's own
+;Default - 0.0.0.0: tries to find out local ip address on it's own
bindaddr=0.0.0.0
+
+;Alias address for for asterisk server
+;Default - "Asterisk PBX"
+h323id=ObjSysAsterisk
+e164=100
+
+;CallerID for the asterisk originated calls
+;Default - Same as h323id
+callerid=asterisk
+
;This parameter indicates whether channel driver should register with
;gatekeeper as a gateway or an endpoint.
;Default - no
;gateway=no
-;Whether asterisk should use fast-start and tunneling for H323 connections.
-;Default - yes
-;faststart=no
-;h245tunneling=no
-
-;Whether media wait for connect
-;Default - No
-;mediawaitforconnect=yes
-
-;H323-ID to be used for asterisk server
-;Default - Asterisk PBX
-h323id=ObjSysAsterisk
-e164=100
-
-;CallerID to use for calls
-;Default - Same as h323id
-callerid=asterisk
-
;Whether this asterisk server will use gatekeeper.
;Default - DISABLE
;gatekeeper = DISCOVER
;gatekeeper = a.b.c.d
gatekeeper = DISABLE
+
+
+;Whether asterisk should use fast-start and tunneling for H323 connections.
+;Default - yes
+;faststart=yes
+;h245tunneling=yes
+
+;Whether media wait for connect for fast start call
+;Default - no
+;mediawaitforconnect=no
;Location for H323 log file
;Default - /var/log/asterisk/h323_log
@@ -119,14 +121,14 @@
; accountcode accountcode
; amaflags amaflags
; dtmfmode dtmfmode
-; rtptimeout ip
+; rtptimeout rtptimeout
+; ip
; port
; h323id
; email
; url
; e164
-; rtptimeout
-
+;
;
;Define users here
@@ -152,8 +154,8 @@
[myfriend1]
type=friend
context=default
-ip=10.0.0.82 ; UPDATE with appropriate ip address
-port=1820 ; UPDATE with appropriate port
+ip=a.b.c.d ; UPDATE with appropriate ip address
+port=1720 ; UPDATE with appropriate port
disallow=all
allow=ulaw
e164=12345
Modified: branches/1.4/asterisk-ooh323c/ooh323c/src/ooCapability.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/asterisk-ooh323c/ooh323c/src/ooCapability.c?view=diff&rev=331&r1=330&r2=331
==============================================================================
--- branches/1.4/asterisk-ooh323c/ooh323c/src/ooCapability.c (original)
+++ branches/1.4/asterisk-ooh323c/ooh323c/src/ooCapability.c Fri Jan 19 16:27:05 2007
@@ -898,6 +898,9 @@
H245AudioCapability* audioCap, int dir)
{
int noofframes=0, cap;
+
+ OOTRACEDBGC2("Comparing channel with codec type: %d\n", audioCap->t);
+
switch(audioCap->t)
{
case T_H245AudioCapability_g711Ulaw56k:
@@ -940,11 +943,15 @@
return FALSE;
}
+ OOTRACEDBGC3("Comparing codecs: channel's=%d, requested=%d\n",
+ epCap->cap, cap);
if(cap != epCap->cap) { return FALSE; }
/* Can we receive this capability */
if(dir & OORX)
{
+ OOTRACEDBGC3("Comparing RX frame rate: channel's=%d, requested=%d\n",
+ ((OOCapParams*)epCap->params)->rxframes, noofframes);
if(((OOCapParams*)epCap->params)->rxframes >= noofframes) {
return TRUE;
}
@@ -958,6 +965,8 @@
/* Can we transmit compatible stream */
if(dir & OOTX)
{
+ OOTRACEDBGC3("Comparing TX frame rate: channel's=%d, requested=%d\n",
+ ((OOCapParams*)epCap->params)->txframes, noofframes);
if(((OOCapParams*)epCap->params)->txframes <= noofframes) {
return TRUE;
}
@@ -1684,7 +1693,7 @@
if(!cur) return NULL;
- OOTRACEDBGC4("Found matching simple audio capability type %s. Comparing"
+ OOTRACEDBGC4("Found matching H.263 video capability type %s. Comparing"
" other parameters. (%s, %s)\n", ooGetCapTypeText(cap),
call->callType, call->callToken);
if(dir & OORX)
Modified: branches/1.4/asterisk-ooh323c/ooh323c/src/ooLogChan.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/asterisk-ooh323c/ooh323c/src/ooLogChan.c?view=diff&rev=331&r1=330&r2=331
==============================================================================
--- branches/1.4/asterisk-ooh323c/ooh323c/src/ooLogChan.c (original)
+++ branches/1.4/asterisk-ooh323c/ooh323c/src/ooLogChan.c Fri Jan 19 16:27:05 2007
@@ -191,6 +191,8 @@
{
if(!strcmp(pChannel->dir, dir))
{
+ OOTRACEDBGC3("ooFindLogicalChannel, comparing channel: %d:%s\n",
+ pChannel->sessionID, pChannel->dir);
if(!strcmp(dir, "receive"))
{
if(ooCapabilityCheckCompatibility(call, pChannel->chanCap,
Modified: branches/1.4/asterisk-ooh323c/ooh323c/src/ooh323.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/asterisk-ooh323c/ooh323c/src/ooh323.c?view=diff&rev=331&r1=330&r2=331
==============================================================================
--- branches/1.4/asterisk-ooh323c/ooh323c/src/ooh323.c (original)
+++ branches/1.4/asterisk-ooh323c/ooh323c/src/ooh323.c Fri Jan 19 16:27:05 2007
@@ -528,7 +528,14 @@
}
/* Retrieve the H.245 control channel address from the connect msg */
- if(callProceeding->m.h245AddressPresent)
+ if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
+ q931Msg->userInfo->h323_uu_pdu.h245Tunneling &&
+ callProceeding->m.h245AddressPresent) {
+ OOTRACEINFO3("Tunneling and h245address provided."
+ "Using Tunneling for H.245 messages (%s, %s)\n",
+ call->callType, call->callToken);
+ }
+ else if(callProceeding->m.h245AddressPresent)
{
if (OO_TESTFLAG (call->flags, OO_M_TUNNELING))
{
@@ -718,7 +725,14 @@
}
/* Retrieve the H.245 control channel address from the connect msg */
- if(alerting->m.h245AddressPresent)
+ if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
+ q931Msg->userInfo->h323_uu_pdu.h245Tunneling &&
+ alerting->m.h245AddressPresent) {
+ OOTRACEINFO3("Tunneling and h245address provided."
+ "Giving preference to Tunneling (%s, %s)\n",
+ call->callType, call->callToken);
+ }
+ else if(alerting->m.h245AddressPresent)
{
if (OO_TESTFLAG (call->flags, OO_M_TUNNELING))
{
@@ -933,7 +947,14 @@
}
/* Retrieve the H.245 control channel address from the CONNECT msg */
- if(connect->m.h245AddressPresent)
+ if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
+ q931Msg->userInfo->h323_uu_pdu.h245Tunneling &&
+ connect->m.h245AddressPresent) {
+ OOTRACEINFO3("Tunneling and h245address provided."
+ "Giving preference to Tunneling (%s, %s)\n",
+ call->callType, call->callToken);
+ }
+ else if(connect->m.h245AddressPresent)
{
if (OO_TESTFLAG (call->flags, OO_M_TUNNELING))
{
Modified: branches/1.4/asterisk-ooh323c/ooh323c/src/ooq931.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/asterisk-ooh323c/ooh323c/src/ooq931.c?view=diff&rev=331&r1=330&r2=331
==============================================================================
--- branches/1.4/asterisk-ooh323c/ooh323c/src/ooq931.c (original)
+++ branches/1.4/asterisk-ooh323c/ooh323c/src/ooq931.c Fri Jan 19 16:27:05 2007
@@ -3358,6 +3358,7 @@
"OOConnect",
"OOReleaseComplete",
"OOFacility",
+ "OOFacility",
"OOMasterSlaveDetermination",
"OOMasterSlaveAck",
"OOMasterSlaveReject",
Modified: branches/1.4/asterisk-ooh323c/src/chan_h323.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/asterisk-ooh323c/src/chan_h323.c?view=diff&rev=331&r1=330&r2=331
==============================================================================
--- branches/1.4/asterisk-ooh323c/src/chan_h323.c (original)
+++ branches/1.4/asterisk-ooh323c/src/chan_h323.c Fri Jan 19 16:27:05 2007
@@ -991,7 +991,7 @@
struct ooh323_pvt *p = newchan->tech_pvt;
if(gH323Debug)
- ast_verbose("start: ooh323c ooh323_fixup\n");
+ ast_verbose("--- ooh323c ooh323_fixup\n");
ast_mutex_lock(&p->lock);
if (p->owner != oldchan) {
@@ -1010,7 +1010,7 @@
ast_mutex_unlock(&p->lock);
if(gH323Debug)
- ast_verbose("end: ooh323c ooh323_fixup \n");
+ ast_verbose("+++ ooh323c ooh323_fixup \n");
return 0;
}
@@ -2962,6 +2962,8 @@
return OO_G729A;
case AST_FORMAT_G723_1:
return OO_G7231;
+ case AST_FORMAT_H263:
+ return OO_H263VIDEO;
default:
ast_log(LOG_NOTICE, "Don't know how to deal with mode %s\n",
ast_getformatname_multiple(formats,512,cap));
Modified: branches/1.4/asterisk-ooh323c/src/ooh323cDriver.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/asterisk-ooh323c/src/ooh323cDriver.c?view=diff&rev=331&r1=330&r2=331
==============================================================================
--- branches/1.4/asterisk-ooh323c/src/ooh323cDriver.c (original)
+++ branches/1.4/asterisk-ooh323c/src/ooh323cDriver.c Fri Jan 19 16:27:05 2007
@@ -120,6 +120,18 @@
}
+ if(format & AST_FORMAT_H263)
+ {
+ if(gH323Debug)
+ ast_verbose("\tAdding h263 capability to H323 endpoint\n");
+ ret = ooH323EpAddH263VideoCapability(OO_H263VIDEO, 1, 0, 0, 0, 0, 320*1024,
+ OORXANDTX, &ooh323c_start_receive_channel,
+ &ooh323c_start_transmit_channel,
+ &ooh323c_stop_receive_channel,
+ &ooh323c_stop_transmit_channel);
+
+ }
+
if(format & AST_FORMAT_GSM)
{
if(gH323Debug)
@@ -217,6 +229,19 @@
ast_verbose("\tAdding g7231 capability to call (%s, %s)\n",
call->callType, call->callToken);
ret = ooCallAddG7231Capability(call, OO_G7231, 4, 7, FALSE,
+ OORXANDTX, &ooh323c_start_receive_channel,
+ &ooh323c_start_transmit_channel,
+ &ooh323c_stop_receive_channel,
+ &ooh323c_stop_transmit_channel);
+
+ }
+
+ if(format & AST_FORMAT_H263)
+ {
+ if(gH323Debug)
+ ast_verbose("\tAdding h263 capability to call (%s, %s)\n",
+ call->callType, call->callToken);
+ ret = ooCallAddH263VideoCapability(call, OO_H263VIDEO, 1, 0, 0, 0, 0, 320*1024,
OORXANDTX, &ooh323c_start_receive_channel,
&ooh323c_start_transmit_channel,
&ooh323c_stop_receive_channel,
@@ -322,6 +347,8 @@
return AST_FORMAT_G729A;
case OO_G7231:
return AST_FORMAT_G723_1;
+ case OO_H263VIDEO:
+ return AST_FORMAT_H263;
default:
ast_log(LOG_DEBUG, "Cap %d is not supported by driver yet\n");
return -1;
More information about the asterisk-addons-commits
mailing list