[asterisk-commits] pcadach: branch pcadach/chan_h323-live r43200 -
in /team/pcadach/chan_h323-li...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon Sep 18 10:39:10 MST 2006
Author: pcadach
Date: Mon Sep 18 12:39:09 2006
New Revision: 43200
URL: http://svn.digium.com/view/asterisk?rev=43200&view=rev
Log:
Merged revisions 43185 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r43185 | mogorman | 2006-09-18 22:36:14 +0600 (Пнд, 18 Сен 2006) | 5 lines
seperate jingle and gtalk so it will be easier to track
changes in both of the moving specs. Currently chan_gtalk is
compatible with the latest gtalk/libjingle version, and chan_jingle
needs a lot of work.
........
Added:
team/pcadach/chan_h323-live/channels/chan_gtalk.c (props changed)
- copied unchanged from r43185, trunk/channels/chan_gtalk.c
team/pcadach/chan_h323-live/configs/gtalk.conf.sample (props changed)
- copied unchanged from r43185, trunk/configs/gtalk.conf.sample
Modified:
team/pcadach/chan_h323-live/ (props changed)
team/pcadach/chan_h323-live/channels/chan_jingle.c
team/pcadach/chan_h323-live/doc/jingle.txt
Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
automerge = *
Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep 18 12:39:09 2006
@@ -1,1 +1,1 @@
-/trunk:1-43179
+/trunk:1-43198
Propchange: team/pcadach/chan_h323-live/channels/chan_gtalk.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/pcadach/chan_h323-live/channels/chan_gtalk.c
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/pcadach/chan_h323-live/channels/chan_gtalk.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: team/pcadach/chan_h323-live/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/channels/chan_jingle.c?rev=43200&r1=43199&r2=43200&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/channels/chan_jingle.c (original)
+++ team/pcadach/chan_h323-live/channels/chan_jingle.c Mon Sep 18 12:39:09 2006
@@ -156,7 +156,7 @@
};
struct jingle_container {
- ASTOBJ_CONTAINER_COMPONENTS(struct jingle);
+ ASTOBJ_CONTAINER_COMPONENTS(struct jingle);
};
static const char desc[] = "Jingle Channel";
@@ -521,7 +521,7 @@
"unsupported-dtmf-method xmlns='http://jabber.org/protocol/jingle/info/dtmf#errors'");
return -1;
}
- if ((dtmfnode = iks_find(pak->x, "dtmf"))) {
+ if ((dtmfnode = iks_find(pak->x, "dtmf"))) {
if((dtmf = iks_find_attrib(dtmfnode, "code"))) {
if(iks_find_with_attrib(pak->x, "dtmf", "action", "button-up")) {
struct ast_frame f = {AST_FRAME_DTMF_BEGIN, };
@@ -995,7 +995,7 @@
struct jingle_pvt *p = NULL, *tmp = NULL;
struct aji_client *c = client->connection;
struct jingle_candidate *newcandidate = NULL;
- iks *traversenodes = NULL, *receipt = NULL;
+ iks *traversenodes = NULL, *receipt = NULL;
newcandidate = ast_calloc(1, sizeof(*newcandidate));
if (!newcandidate)
return 0;
@@ -1533,7 +1533,7 @@
member->connection = client;
iks_filter_add_rule(client->f, jingle_parser, member, IKS_RULE_TYPE,
IKS_PAK_IQ, IKS_RULE_FROM_PARTIAL, member->user,
- IKS_RULE_NS, "http://www.google.com/session",
+ IKS_RULE_NS, "http://jabber.org/protocol/jingle",
IKS_RULE_DONE);
} else {
ast_log(LOG_ERROR, "connection referenced not found!\n");
@@ -1640,7 +1640,7 @@
ASTOBJ_WRLOCK(member);
member->connection = iterator;
iks_filter_add_rule(iterator->f, jingle_parser, member, IKS_RULE_TYPE, IKS_PAK_IQ, IKS_RULE_NS,
- "http://www.google.com/session", IKS_RULE_DONE);
+ "http://jabber.org/protocol/jingle", IKS_RULE_DONE);
ASTOBJ_UNLOCK(member);
ASTOBJ_CONTAINER_LINK(&jingles, member);
ASTOBJ_UNLOCK(iterator);
@@ -1715,9 +1715,9 @@
ASTOBJ_WRLOCK(iterator);
privates = iterator->p;
while(privates) {
- if (privates->owner)
- ast_softhangup(privates->owner, AST_SOFTHANGUP_APPUNLOAD);
- privates = privates->next;
+ if (privates->owner)
+ ast_softhangup(privates->owner, AST_SOFTHANGUP_APPUNLOAD);
+ privates = privates->next;
}
iterator->p = NULL;
ASTOBJ_UNLOCK(iterator);
Propchange: team/pcadach/chan_h323-live/configs/gtalk.conf.sample
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/pcadach/chan_h323-live/configs/gtalk.conf.sample
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/pcadach/chan_h323-live/configs/gtalk.conf.sample
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: team/pcadach/chan_h323-live/doc/jingle.txt
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/doc/jingle.txt?rev=43200&r1=43199&r2=43200&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/doc/jingle.txt (original)
+++ team/pcadach/chan_h323-live/doc/jingle.txt Mon Sep 18 12:39:09 2006
@@ -1,8 +1,10 @@
(Jingle support in asterisk is experimental)
Jingle is an xmpp based protocol for signalling the transfer of media.
Currently asterisk supports the proprietary GoogleTalk protocol that is
-very similar to jingle, and hopes to support true jingle specs
+very similar to jingle, and hopes to soon support true jingle specs
(JEP-166,167,176,177,180,181 etc) as more clients support the true standard.
Jingle's configuration is very similar to sip.conf only as we are not the
jabber server in this case you must provide a connection for the peer to
travel out on.
+chan_gtalk is for supporting the non-jingle google/libjingle spec and
+chan_jingle will continue to move in the direction of the correct spec.
More information about the asterisk-commits
mailing list