[asterisk-commits] tzafrir: branch group/zapata_conf r84136 - in /team/group/zapata_conf: ./ app...

Sat Sep 29 18:34:20 CDT 2007

Author: tzafrir
Date: Sat Sep 29 18:34:18 2007
New Revision: 84136

URL: http://svn.digium.com/view/asterisk?view=rev&rev=84136
Log:
Merged revisions 83590,83654-83656,83671,83696,83726,83741,83743,83758,83774,83804,83819,83834,83849,83864,83880,83911,83942,83944,83977-83978,83986,84019,84050,84079-84080,84115,84130,84134 via svnmerge from 
http://svn.digium.com/svn/asterisk/trunk

................
r83590 | murf | 2007-09-22 21:54:10 +0200 (Sat, 22 Sep 2007) | 9 lines

Merged revisions 83589 via svnmerge from 
http://svn.digium.com/svn/asterisk/branches/1.4

........
r83589 | murf | 2007-09-22 13:39:16 -0600 (Sat, 22 Sep 2007) | 1 line

This closes issue #10788 -- The exact same fixes are made here for the first arg in the for(arg1; arg2; arg3) {} statement, as were done for the 3rd arg. It can now be an assignment that will embedded in a Set() app, or a macro call, or an app call.
........

................
r83654 | tilghman | 2007-09-24 18:40:12 +0200 (Mon, 24 Sep 2007) | 11 lines

Merged revisions 83637 via svnmerge from 
http://svn.digium.com/svn/asterisk/branches/1.4

........
r83637 | tilghman | 2007-09-24 10:17:06 -0500 (Mon, 24 Sep 2007) | 3 lines

Making change to group splitting, as discussed on the -dev list.  The main
effect of this will be to permit Set(GROUP([cat])=), i.e. unsetting a group.

........

................
r83655 | tilghman | 2007-09-24 18:42:48 +0200 (Mon, 24 Sep 2007) | 9 lines

Blocked revisions 83653 via svnmerge

........
r83653 | tilghman | 2007-09-24 11:37:52 -0500 (Mon, 24 Sep 2007) | 2 lines

Oops.  Removed the unworkable workaround.  This note should never have been in the release.

........

................
r83656 | mmichelson | 2007-09-24 19:00:57 +0200 (Mon, 24 Sep 2007) | 5 lines

interface_exists_global was never returning 1. Most likely an error from my merge on Friday.

(closes issue #10817, reported and patched by snar, patch simplified by me)


................
r83671 | dhubbard | 2007-09-24 19:10:14 +0200 (Mon, 24 Sep 2007) | 1 line

merged jcmoore's patch for configurable SDP origin-field username and session field, closes issue# 10795
................
r83696 | tilghman | 2007-09-24 19:29:02 +0200 (Mon, 24 Sep 2007) | 12 lines

Merged revisions 83695 via svnmerge from 
http://svn.digium.com/svn/asterisk/branches/1.4

........
r83695 | tilghman | 2007-09-24 12:22:08 -0500 (Mon, 24 Sep 2007) | 4 lines

In the source, keys are relative to the datadir, not varlib (which is the same
in most cases, but it's good to be accurate).
Closes issue #10811

........

................
r83726 | tilghman | 2007-09-25 00:06:19 +0200 (Tue, 25 Sep 2007) | 2 lines

Permit custom locations for astdb and the keys directory (though default to the current locations) (Closes issue #10267)

................
r83741 | russell | 2007-09-25 10:09:01 +0200 (Tue, 25 Sep 2007) | 3 lines

Add some files to the utils directory svn:ignore and Makefile clean target
(closes issue #10808, reported by mvanbaak)

................
r83743 | phsultan | 2007-09-25 11:07:30 +0200 (Tue, 25 Sep 2007) | 22 lines

Comply with latest XEP-0166, XEP-0167, XEP-0176.

No real Jingle implementation being available, testing was made using
two Asterisk servers relaying SIP calls over their Jingle channels:

SIP Phone 1 --- [chan_sip]Asterisk 1[chan_jingle] --- [chan_jingle]Asterisk 2[chan_sip] --- SIP Phone 2

Thus, it was possible to test the code in both ways, and make the
Jingle channel comply with the latest specifications. No sound available yet.

Main modifications include :
- modified the 'jingle_candidate' structure and the
  'jingle_create_candidates' function according to XEP-0176 ;
- modified the 'jingle_action' function in order to properly terminate
  a Jingle session, in conformance with XEP-0166 ;
- modified username format used in STUN requests ;
- actually make the bindaddr configuration field useable.

Todo :
- set audio paths up (no native bridging) ;
- make the CLI gtalk functions available to jingle ;
- clean up the storage space used in strings.
................
r83758 | file | 2007-09-25 15:41:02 +0200 (Tue, 25 Sep 2007) | 2 lines

Fix minor memory leak in pval.c. Overwriting a value without freeing the previous result is bad, mmmk?

................
r83774 | tilghman | 2007-09-25 16:18:09 +0200 (Tue, 25 Sep 2007) | 10 lines

Merged revisions 83773 via svnmerge from 
http://svn.digium.com/svn/asterisk/branches/1.4

........
r83773 | tilghman | 2007-09-25 09:13:25 -0500 (Tue, 25 Sep 2007) | 2 lines

jmls pointed out that unsetting the group and setting the group to the blank string aren't quite the same.

........

................
r83804 | phsultan | 2007-09-25 18:34:49 +0200 (Tue, 25 Sep 2007) | 2 lines

Added a CLI command that shows our buddy list, as suggested by Daniel McKeehan, thanks!

................
r83819 | russell | 2007-09-25 23:06:44 +0200 (Tue, 25 Sep 2007) | 4 lines

Don't note that functions are deprecated in favor of themselves.  This was
found by showing a very poor example doxygen function in a presentation this
morning.  :)

................
r83834 | mattf | 2007-09-26 01:14:03 +0200 (Wed, 26 Sep 2007) | 1 line

Fix typo in readme
................
r83849 | russell | 2007-09-26 08:31:05 +0200 (Wed, 26 Sep 2007) | 3 lines

Change function documentation to use doxygen tags.  (Really, I just needed
to make some minor change in trunk to test something with automerge ...)

................
r83864 | russell | 2007-09-26 08:53:43 +0200 (Wed, 26 Sep 2007) | 1 line

fix a typo in a comment
................
r83880 | tilghman | 2007-09-26 20:43:23 +0200 (Wed, 26 Sep 2007) | 10 lines

Merged revisions 83879 via svnmerge from 
http://svn.digium.com/svn/asterisk/branches/1.4

........
r83879 | tilghman | 2007-09-26 13:35:56 -0500 (Wed, 26 Sep 2007) | 2 lines

Remove unused 4k of memory on the program stack (closes issue #10827)

........

................
r83911 | russell | 2007-09-26 23:04:03 +0200 (Wed, 26 Sep 2007) | 11 lines

Merged revisions 83910 via svnmerge from 
http://svn.digium.com/svn/asterisk/branches/1.4

........
r83910 | russell | 2007-09-26 15:50:09 -0500 (Wed, 26 Sep 2007) | 3 lines

Fix building chan_misdn under dev-mode.  (please run the configure script
with --enable-dev-mode so this doesn't happen again ...)

........

................
r83942 | russell | 2007-09-26 23:17:41 +0200 (Wed, 26 Sep 2007) | 13 lines

Merged revisions 83941 via svnmerge from 
http://svn.digium.com/svn/asterisk/branches/1.4

........
r83941 | russell | 2007-09-26 16:15:15 -0500 (Wed, 26 Sep 2007) | 5 lines

Add a log message that was requested by the masses in the developer tutorial
session at Astricon.  chan_sip did not output any message when a call was
rejected because the extension was not found.  This adds a verbose message
(at verbose level 3) to note when this happens.

........

................
r83944 | russell | 2007-09-26 23:36:34 +0200 (Wed, 26 Sep 2007) | 10 lines

Merged revisions 83943 via svnmerge from 
http://svn.digium.com/svn/asterisk/branches/1.4

........
r83943 | russell | 2007-09-26 16:35:23 -0500 (Wed, 26 Sep 2007) | 2 lines

I changed my mind ... I think this should be a LOG_NOTICE.

........

................
r83977 | russell | 2007-09-27 02:02:18 +0200 (Thu, 27 Sep 2007) | 9 lines

Merged revisions 83976 via svnmerge from 
http://svn.digium.com/svn/asterisk/branches/1.4

........
r83976 | russell | 2007-09-26 19:01:29 -0500 (Wed, 26 Sep 2007) | 1 line

remove a todo item that has been completed
........

................
r83978 | kpfleming | 2007-09-27 02:06:06 +0200 (Thu, 27 Sep 2007) | 2 lines

deal with more gcc 4.2 const pointer warnings

................
r83986 | kpfleming | 2007-09-27 02:08:47 +0200 (Thu, 27 Sep 2007) | 10 lines

Merged revisions 83974 via svnmerge from 
http://svn.digium.com/svn/asterisk/branches/1.4

........
r83974 | kpfleming | 2007-09-26 16:53:03 -0700 (Wed, 26 Sep 2007) | 2 lines

avoid the weird usage of assert() in the ALSA header files that gcc 4.2 wants to complain about

........

................
r84019 | dhubbard | 2007-09-28 01:18:09 +0200 (Fri, 28 Sep 2007) | 9 lines

Merged revisions 84018 via svnmerge from 
http://svn.digium.com/svn/asterisk/branches/1.4

........
r84018 | dhubbard | 2007-09-27 18:12:25 -0500 (Thu, 27 Sep 2007) | 1 line

if an Agent is redirected, the base channel should actually be redirected.  This was causing multiple issues, especially issue 7706 and BE-160
........

................
r84050 | tilghman | 2007-09-28 07:37:16 +0200 (Fri, 28 Sep 2007) | 11 lines

Merged revisions 84049 via svnmerge from 
http://svn.digium.com/svn/asterisk/branches/1.4

........
r84049 | tilghman | 2007-09-28 00:30:22 -0500 (Fri, 28 Sep 2007) | 3 lines

Avoid a deadlock with ALL of the locks in the masquerade function, not just the
pairs of channels.  (Closes issue #10406)

........

................
r84079 | tilghman | 2007-09-28 16:22:58 +0200 (Fri, 28 Sep 2007) | 10 lines

Merged revisions 84078 via svnmerge from 
http://svn.digium.com/svn/asterisk/branches/1.4

........
r84078 | tilghman | 2007-09-28 09:13:47 -0500 (Fri, 28 Sep 2007) | 2 lines

Correct pronunciations of numbers for .nl (Closes issue #10837)

........

................
r84080 | tilghman | 2007-09-28 16:35:36 +0200 (Fri, 28 Sep 2007) | 2 lines

Autoconf requires version 2.60, not 2.59, to process (Closes issue #10842)

................
r84115 | mattf | 2007-09-29 02:19:15 +0200 (Sat, 29 Sep 2007) | 1 line

Let's use process time instead of wall clock time for show translation
................
r84130 | tilghman | 2007-09-29 20:21:36 +0200 (Sat, 29 Sep 2007) | 2 lines

Set enablecdr at the end of re-reading the config file (Closes issue #10852)

................
r84134 | murf | 2007-09-30 00:40:58 +0200 (Sun, 30 Sep 2007) | 1 line

the last commit for AEL affected a small number of tests. Added a regression test for glob'd includes
................

Added:
    team/group/zapata_conf/pbx/ael/ael-test/ael-ntest22/
      - copied from r84134, trunk/pbx/ael/ael-test/ael-ntest22/
    team/group/zapata_conf/pbx/ael/ael-test/ael-ntest22/extensions.ael
      - copied unchanged from r84134, trunk/pbx/ael/ael-test/ael-ntest22/extensions.ael
    team/group/zapata_conf/pbx/ael/ael-test/ael-ntest22/qq.ael
      - copied unchanged from r84134, trunk/pbx/ael/ael-test/ael-ntest22/qq.ael
    team/group/zapata_conf/pbx/ael/ael-test/ael-ntest22/t1/
      - copied from r84134, trunk/pbx/ael/ael-test/ael-ntest22/t1/
    team/group/zapata_conf/pbx/ael/ael-test/ael-ntest22/t1/a.ael
      - copied unchanged from r84134, trunk/pbx/ael/ael-test/ael-ntest22/t1/a.ael
    team/group/zapata_conf/pbx/ael/ael-test/ael-ntest22/t1/b.ael
      - copied unchanged from r84134, trunk/pbx/ael/ael-test/ael-ntest22/t1/b.ael
    team/group/zapata_conf/pbx/ael/ael-test/ael-ntest22/t1/c.ael
      - copied unchanged from r84134, trunk/pbx/ael/ael-test/ael-ntest22/t1/c.ael
    team/group/zapata_conf/pbx/ael/ael-test/ael-ntest22/t2/
      - copied from r84134, trunk/pbx/ael/ael-test/ael-ntest22/t2/
    team/group/zapata_conf/pbx/ael/ael-test/ael-ntest22/t2/d.ael
      - copied unchanged from r84134, trunk/pbx/ael/ael-test/ael-ntest22/t2/d.ael
    team/group/zapata_conf/pbx/ael/ael-test/ael-ntest22/t2/e.ael
      - copied unchanged from r84134, trunk/pbx/ael/ael-test/ael-ntest22/t2/e.ael
    team/group/zapata_conf/pbx/ael/ael-test/ael-ntest22/t2/f.ael
      - copied unchanged from r84134, trunk/pbx/ael/ael-test/ael-ntest22/t2/f.ael
    team/group/zapata_conf/pbx/ael/ael-test/ael-ntest22/t3/
      - copied from r84134, trunk/pbx/ael/ael-test/ael-ntest22/t3/
    team/group/zapata_conf/pbx/ael/ael-test/ael-ntest22/t3/g.ael
      - copied unchanged from r84134, trunk/pbx/ael/ael-test/ael-ntest22/t3/g.ael
    team/group/zapata_conf/pbx/ael/ael-test/ael-ntest22/t3/h.ael
      - copied unchanged from r84134, trunk/pbx/ael/ael-test/ael-ntest22/t3/h.ael
    team/group/zapata_conf/pbx/ael/ael-test/ael-ntest22/t3/i.ael
      - copied unchanged from r84134, trunk/pbx/ael/ael-test/ael-ntest22/t3/i.ael
    team/group/zapata_conf/pbx/ael/ael-test/ael-ntest22/t3/j.ael
      - copied unchanged from r84134, trunk/pbx/ael/ael-test/ael-ntest22/t3/j.ael
    team/group/zapata_conf/pbx/ael/ael-test/ref.ael-ntest22
      - copied unchanged from r84134, trunk/pbx/ael/ael-test/ref.ael-ntest22
Modified:
    team/group/zapata_conf/   (props changed)
    team/group/zapata_conf/Makefile
    team/group/zapata_conf/apps/app_queue.c
    team/group/zapata_conf/build_tools/make_defaults_h
    team/group/zapata_conf/cdr/cdr_manager.c
    team/group/zapata_conf/channels/chan_agent.c
    team/group/zapata_conf/channels/chan_alsa.c
    team/group/zapata_conf/channels/chan_jingle.c
    team/group/zapata_conf/channels/chan_sip.c
    team/group/zapata_conf/channels/chan_zap.c
    team/group/zapata_conf/configs/sip.conf.sample
    team/group/zapata_conf/configure
    team/group/zapata_conf/configure.ac
    team/group/zapata_conf/doc/ss7.txt
    team/group/zapata_conf/include/asterisk/channel.h
    team/group/zapata_conf/include/asterisk/devicestate.h
    team/group/zapata_conf/include/asterisk/event.h
    team/group/zapata_conf/include/asterisk/file.h
    team/group/zapata_conf/include/asterisk/jingle.h
    team/group/zapata_conf/main/app.c
    team/group/zapata_conf/main/asterisk.c
    team/group/zapata_conf/main/channel.c
    team/group/zapata_conf/main/manager.c
    team/group/zapata_conf/main/say.c
    team/group/zapata_conf/main/translate.c
    team/group/zapata_conf/pbx/ael/ael-test/ref.ael-test2
    team/group/zapata_conf/pbx/ael/ael-test/ref.ael-test3
    team/group/zapata_conf/pbx/ael/ael-test/ref.ael-test4
    team/group/zapata_conf/pbx/pbx_dundi.c
    team/group/zapata_conf/res/ael/ael.tab.c
    team/group/zapata_conf/res/ael/ael.y
    team/group/zapata_conf/res/ael/pval.c
    team/group/zapata_conf/res/res_jabber.c
    team/group/zapata_conf/utils/   (props changed)
    team/group/zapata_conf/utils/Makefile

Propchange: team/group/zapata_conf/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/group/zapata_conf/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/zapata_conf/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Sep 29 18:34:18 2007
@@ -1,1 +1,1 @@
-/trunk:1-83587
+/trunk:1-84134

Modified: team/group/zapata_conf/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/zapata_conf/Makefile?view=diff&rev=84136&r1=84135&r2=84136
==============================================================================
--- team/group/zapata_conf/Makefile (original)
+++ team/group/zapata_conf/Makefile Sat Sep 29 18:34:18 2007
@@ -108,6 +108,8 @@
   ASTETCDIR=/var/etc/asterisk
   ASTLIBDIR=/opt/asterisk/lib
   ASTVARLIBDIR=/var/opt/asterisk
+  ASTDBDIR=$(ASTVARLIBDIR)
+  ASTKEYDIR=$(ASTVARLIBDIR)
   ASTSPOOLDIR=/var/spool/asterisk
   ASTLOGDIR=/var/log/asterisk
   ASTHEADERDIR=/opt/asterisk/include
@@ -128,9 +130,12 @@
 ifneq ($(findstring BSD,$(OSARCH)),)
   ASTVARLIBDIR=$(prefix)/share/asterisk
   ASTVARRUNDIR=$(localstatedir)/run/asterisk
+  ASTDBDIR=$(localstatedir)/db/asterisk
 else
   ASTVARLIBDIR=$(localstatedir)/lib/asterisk
-endif
+  ASTDBDIR=$(ASTVARLIBDIR)
+endif
+  ASTKEYDIR=$(ASTVARLIBDIR)
 endif
 ifeq ($(ASTDATADIR),)
   ASTDATADIR:=$(ASTVARLIBDIR)
@@ -556,6 +561,8 @@
 		echo "astetcdir => $(ASTETCDIR)" ; \
 		echo "astmoddir => $(MODULES_DIR)" ; \
 		echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
+		echo "astdbdir => $(ASTDBDIR)" ; \
+		echo "astkeydir => $(ASTKEYDIR)" ; \
 		echo "astdatadir => $(ASTDATADIR)" ; \
 		echo "astagidir => $(AGI_DIR)" ; \
 		echo "astspooldir => $(ASTSPOOLDIR)" ; \

Modified: team/group/zapata_conf/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/group/zapata_conf/apps/app_queue.c?view=diff&rev=84136&r1=84135&r2=84136
==============================================================================
--- team/group/zapata_conf/apps/app_queue.c (original)
+++ team/group/zapata_conf/apps/app_queue.c Sat Sep 29 18:34:18 2007
@@ -884,6 +884,7 @@
 			ao2_ref(mem, -1);
 			ao2_unlock(q);
 			queue_unref(q);
+			ret = 1;
 			break;
 		}
 		ao2_unlock(q);

Modified: team/group/zapata_conf/build_tools/make_defaults_h
URL: http://svn.digium.com/view/asterisk/team/group/zapata_conf/build_tools/make_defaults_h?view=diff&rev=84136&r1=84135&r2=84136
==============================================================================
--- team/group/zapata_conf/build_tools/make_defaults_h (original)
+++ team/group/zapata_conf/build_tools/make_defaults_h Sat Sep 29 18:34:18 2007
@@ -14,7 +14,7 @@
 #define AST_DATA_DIR   "${INSTALL_PATH}${ASTDATADIR}"
 #define AST_LOG_DIR    "${INSTALL_PATH}${ASTLOGDIR}"
 #define AST_AGI_DIR    "${INSTALL_PATH}${AGI_DIR}"
-#define AST_KEY_DIR    "${INSTALL_PATH}${ASTVARLIBDIR}/keys"
+#define AST_KEY_DIR    "${INSTALL_PATH}${ASTDATADIR}/keys"
 #define AST_DB         "${INSTALL_PATH}${ASTVARLIBDIR}/astdb"
 #define AST_TMP_DIR    "${INSTALL_PATH}${ASTSPOOLDIR}/tmp"
 

Modified: team/group/zapata_conf/cdr/cdr_manager.c
URL: http://svn.digium.com/view/asterisk/team/group/zapata_conf/cdr/cdr_manager.c?view=diff&rev=84136&r1=84135&r2=84136
==============================================================================
--- team/group/zapata_conf/cdr/cdr_manager.c (original)
+++ team/group/zapata_conf/cdr/cdr_manager.c Sat Sep 29 18:34:18 2007
@@ -114,6 +114,7 @@
 		ast_cdr_unregister(name);
 	else if (!enablecdr && newenablecdr)
 		ast_cdr_register(name, "Asterisk Manager Interface CDR Backend", manager_log);
+	enablecdr = newenablecdr;
 
 	return 1;
 }

Modified: team/group/zapata_conf/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/team/group/zapata_conf/channels/chan_agent.c?view=diff&rev=84136&r1=84135&r2=84136
==============================================================================
--- team/group/zapata_conf/channels/chan_agent.c (original)
+++ team/group/zapata_conf/channels/chan_agent.c Sat Sep 29 18:34:18 2007
@@ -231,6 +231,8 @@
 static struct ast_channel *agent_bridgedchannel(struct ast_channel *chan, struct ast_channel *bridge);
 static void set_agentbycallerid(const char *callerid, const char *agent);
 static char *complete_agent_logoff_cmd(const char *line, const char *word, int pos, int state);
+static struct ast_channel* agent_get_base_channel(struct ast_channel *chan);
+static int agent_set_base_channel(struct ast_channel *chan, struct ast_channel *base);
 
 /*! \brief Channel interface description for PBX integration */
 static const struct ast_channel_tech agent_tech = {
@@ -253,6 +255,8 @@
 	.indicate = agent_indicate,
 	.fixup = agent_fixup,
 	.bridged_channel = agent_bridgedchannel,
+	.get_base_channel = agent_get_base_channel,
+	.set_base_channel = agent_set_base_channel,
 };
 
 /*!
@@ -696,6 +700,37 @@
 
 	snprintf(buf, sizeof(buf), "%s_%s", GETAGENTBYCALLERID, callerid);
 	pbx_builtin_setvar_helper(NULL, buf, agent);
+}
+
+struct ast_channel* agent_get_base_channel(struct ast_channel *chan)
+{
+	struct agent_pvt *p = NULL;
+	struct ast_channel *base = NULL;
+	
+	if (!chan || !chan->tech_pvt) {
+		ast_log(LOG_ERROR, "whoa, you need a channel (0x%ld) with a tech_pvt (0x%ld) to get a base channel.\n", (long)chan, (chan)?(long)chan->tech_pvt:(long)NULL);
+	} else {
+		p = chan->tech_pvt;
+		base = p->chan;
+	}
+	return base;
+}
+
+int agent_set_base_channel(struct ast_channel *chan, struct ast_channel *base)
+{
+	struct agent_pvt *p = NULL;
+	
+	if (!chan || !base) {
+		ast_log(LOG_ERROR, "whoa, you need a channel (0x%ld) and a base channel (0x%ld) for setting.\n", (long)chan, (long)base);
+		return -1;
+	}
+	p = chan->tech_pvt;
+	if (!p) {
+		ast_log(LOG_ERROR, "whoa, channel %s is missing his tech_pvt structure!!.\n", chan->name);
+		return -1;
+	}
+	p->chan = base;
+	return 0;
 }
 
 static int agent_hangup(struct ast_channel *ast)

Modified: team/group/zapata_conf/channels/chan_alsa.c
URL: http://svn.digium.com/view/asterisk/team/group/zapata_conf/channels/chan_alsa.c?view=diff&rev=84136&r1=84135&r2=84136
==============================================================================
--- team/group/zapata_conf/channels/chan_alsa.c (original)
+++ team/group/zapata_conf/channels/chan_alsa.c Sat Sep 29 18:34:18 2007
@@ -368,7 +368,8 @@
 		ast_debug(1, "Opening device %s in %s mode\n", dev, (stream == SND_PCM_STREAM_CAPTURE) ? "read" : "write");
 	}
 
-	snd_pcm_hw_params_alloca(&hwparams);
+	hwparams = alloca(snd_pcm_hw_params_sizeof());
+	memset(hwparams, 0, snd_pcm_hw_params_sizeof());
 	snd_pcm_hw_params_any(handle, hwparams);
 
 	err = snd_pcm_hw_params_set_access(handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED);
@@ -419,7 +420,8 @@
 	if (err < 0)
 		ast_log(LOG_ERROR, "Couldn't set the new hw params: %s\n", snd_strerror(err));
 
-	snd_pcm_sw_params_alloca(&swparams);
+	swparams = alloca(snd_pcm_sw_params_sizeof());
+	memset(swparams, 0, snd_pcm_sw_params_sizeof());
 	snd_pcm_sw_params_current(handle, swparams);
 
 #if 1

Modified: team/group/zapata_conf/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/team/group/zapata_conf/channels/chan_jingle.c?view=diff&rev=84136&r1=84135&r2=84136
==============================================================================
--- team/group/zapata_conf/channels/chan_jingle.c (original)
+++ team/group/zapata_conf/channels/chan_jingle.c Sat Sep 29 18:34:18 2007
@@ -96,14 +96,15 @@
 static struct ast_jb_conf global_jbconf;
 
 enum jingle_protocol {
-	AJI_PROTOCOL_UDP = 1,
-	AJI_PROTOCOL_SSLTCP = 2,
+	AJI_PROTOCOL_UDP,
+	AJI_PROTOCOL_SSLTCP,
 };
 
 enum jingle_connect_type {
-	AJI_CONNECT_STUN = 1,
-	AJI_CONNECT_LOCAL = 2,
-	AJI_CONNECT_RELAY = 3,
+	AJI_CONNECT_HOST,
+	AJI_CONNECT_PRFLX,
+	AJI_CONNECT_RELAY,
+	AJI_CONNECT_SRFLX,
 };
 
 struct jingle_pvt {
@@ -132,17 +133,18 @@
 };
 
 struct jingle_candidate {
-	char name[100];
+	unsigned int component;          /*!< ex. : 1 for RTP, 2 for RTCP */
+	unsigned int foundation;         /*!< Function of IP, protocol, type */
+	unsigned int generation;
+	char ip[16];
+	unsigned int network;
+	unsigned int port;
+	unsigned int priority;
 	enum jingle_protocol protocol;
-	double preference;
-	char username[100];
 	char password[100];
 	enum jingle_connect_type type;
-	char network[6];
-	int generation;
-	char ip[16];
-	int port;
-	int receipt;
+	char ufrag[100];
+	unsigned int preference;
 	struct jingle_candidate *next;
 };
 
@@ -359,7 +361,7 @@
 		ast_aji_increment_mid(client->connection->mid);
 
 		iks_insert_attrib(jingle, "xmlns", JINGLE_NS);
-		iks_insert_attrib(jingle, "type", JINGLE_ACCEPT);
+		iks_insert_attrib(jingle, "action", JINGLE_ACCEPT);
 		iks_insert_attrib(jingle, "initiator", p->initiator ? client->connection->jid->full : p->from);
 		iks_insert_attrib(jingle, JINGLE_SID, tmp->sid);
 		iks_insert_node(iq, jingle);
@@ -593,14 +595,17 @@
 	struct sockaddr_in sin;
 	struct sockaddr_in dest;
 	struct in_addr us;
-	iks *iq, *jingle, *candidate;
-	char user[17], pass[17], preference[5], port[7];
+	struct in_addr externaddr;
+	iks *iq, *jingle, *content, *transport, *candidate;
+	char component[16], foundation[16], generation[16], network[16], pass[16], port[7], priority[16], user[16];
 
 
 	iq = iks_new("iq");
 	jingle = iks_new(JINGLE_NODE);
+	content = iks_new("content");
+	transport = iks_new("transport");
 	candidate = iks_new("candidate");
-	if (!iq || !jingle || !candidate) {
+	if (!iq || !jingle || !content || !transport || !candidate) {
 		ast_log(LOG_ERROR, "Memory allocation error\n");
 		goto safeout;
 	}
@@ -608,8 +613,11 @@
 	ours2 = ast_calloc(1, sizeof(*ours2));
 	if (!ours1 || !ours2)
 		goto safeout;
+
 	iks_insert_node(iq, jingle);
-	iks_insert_node(jingle, candidate);
+	iks_insert_node(jingle, content);
+	iks_insert_node(content, transport);
+	iks_insert_node(transport, candidate);
 
 	for (; p; p = p->next) {
 		if (!strcasecmp(p->sid, sid))
@@ -624,33 +632,41 @@
 	ast_rtp_get_us(p->rtp, &sin);
 	ast_find_ourip(&us, bindaddr);
 
-	/* Setup our jingle candidates */
-	ast_copy_string(ours1->name, "rtp", sizeof(ours1->name));
+	/* Setup our first jingle candidate */
+	ours1->component = 1;
+	ours1->foundation = (unsigned int)bindaddr.sin_addr.s_addr | AJI_CONNECT_HOST | AJI_PROTOCOL_UDP;
+	ours1->generation = 0;
+	ast_copy_string(ours1->ip, ast_inet_ntoa(us), sizeof(ours1->ip));
+	ours1->network = 0;
 	ours1->port = ntohs(sin.sin_port);
-	ours1->preference = 1;
+	ours1->priority = 1678246398;
+	ours1->protocol = AJI_PROTOCOL_UDP;
+	snprintf(pass, sizeof(pass), "%08lx%08lx", ast_random(), ast_random());
+	ast_copy_string(ours1->password, pass, sizeof(ours1->password));
+	ours1->type = AJI_CONNECT_HOST;
 	snprintf(user, sizeof(user), "%08lx%08lx", ast_random(), ast_random());
-	snprintf(pass, sizeof(pass), "%08lx%08lx", ast_random(), ast_random());
-	ast_copy_string(ours1->username, user, sizeof(ours1->username));
-	ast_copy_string(ours1->password, pass, sizeof(ours1->password));
-	ast_copy_string(ours1->ip, ast_inet_ntoa(us), sizeof(ours1->ip));
-	ours1->protocol = AJI_PROTOCOL_UDP;
-	ours1->type = AJI_CONNECT_LOCAL;
-	ours1->generation = 0;
+	ast_copy_string(ours1->ufrag, user, sizeof(ours1->ufrag));
 	p->ourcandidates = ours1;
 
 	if (!ast_strlen_zero(externip)) {
 		/* XXX We should really stun for this one not just go with externip XXX */
+		if (inet_aton(externip, &externaddr))
+			ast_log(LOG_WARNING, "Invalid extern IP : %s\n", externip);
+
+		ours2->component = 1;
+		ours2->foundation = (unsigned int)externaddr.s_addr | AJI_CONNECT_PRFLX | AJI_PROTOCOL_UDP;
+		ours2->generation = 0;
+		ast_copy_string(ours2->ip, externip, sizeof(ours2->ip));
+		ours2->network = 0;
+		ours2->port = ntohs(sin.sin_port);
+		ours2->priority = 1678246397;
+		ours2->protocol = AJI_PROTOCOL_UDP;
+		snprintf(pass, sizeof(pass), "%08lx%08lx", ast_random(), ast_random());
+		ast_copy_string(ours2->password, pass, sizeof(ours2->password));
+		ours2->type = AJI_CONNECT_PRFLX;
+
 		snprintf(user, sizeof(user), "%08lx%08lx", ast_random(), ast_random());
-		snprintf(pass, sizeof(pass), "%08lx%08lx", ast_random(), ast_random());
-		ast_copy_string(ours2->username, user, sizeof(ours2->username));
-		ast_copy_string(ours2->password, pass, sizeof(ours2->password));
-		ast_copy_string(ours2->ip, externip, sizeof(ours2->ip));
-		ast_copy_string(ours2->name, "rtp", sizeof(ours1->name));
-		ours2->port = ntohs(sin.sin_port);
-		ours2->preference = 0.9;
-		ours2->protocol = AJI_PROTOCOL_UDP;
-		ours2->type = AJI_CONNECT_STUN;
-		ours2->generation = 0;
+		ast_copy_string(ours2->ufrag, user, sizeof(ours2->ufrag));
 		ours1->next = ours2;
 		ours2 = NULL;
 	}
@@ -660,35 +676,57 @@
 
 
 	for (tmp = p->ourcandidates; tmp; tmp = tmp->next) {
-		snprintf(port, sizeof(port), "%d", tmp->port);
-		snprintf(preference, sizeof(preference), "%.2f", tmp->preference);
+		snprintf(component, sizeof(component), "%u", tmp->component);
+		snprintf(foundation, sizeof(foundation), "%u", tmp->foundation);
+		snprintf(generation, sizeof(generation), "%u", tmp->generation);
+		snprintf(network, sizeof(network), "%u", tmp->network);
+		snprintf(port, sizeof(port), "%u", tmp->port);
+		snprintf(priority, sizeof(priority), "%u", tmp->priority);
+
 		iks_insert_attrib(iq, "from", c->jid->full);
 		iks_insert_attrib(iq, "to", from);
 		iks_insert_attrib(iq, "type", "set");
 		iks_insert_attrib(iq, "id", c->mid);
 		ast_aji_increment_mid(c->mid);
-		iks_insert_attrib(jingle, "type", "candidates");
-		iks_insert_attrib(jingle, "id", sid);
+		iks_insert_attrib(jingle, "action", JINGLE_NEGOTIATE);
+		iks_insert_attrib(jingle, JINGLE_SID, sid);
 		iks_insert_attrib(jingle, "initiator", (p->initiator) ? c->jid->full : from);
 		iks_insert_attrib(jingle, "xmlns", JINGLE_NS);
-		iks_insert_attrib(candidate, "name", tmp->name);
-		iks_insert_attrib(candidate, "address", tmp->ip);
+		iks_insert_attrib(content, "creator", p->initiator ? "initiator" : "responder");
+		iks_insert_attrib(content, "name", "asterisk-audio-content");
+		iks_insert_attrib(transport, "xmlns", JINGLE_ICE_UDP_NS);
+		iks_insert_attrib(candidate, "component", component);
+		iks_insert_attrib(candidate, "foundation", foundation);
+		iks_insert_attrib(candidate, "generation", generation);
+		iks_insert_attrib(candidate, "ip", tmp->ip);
+		iks_insert_attrib(candidate, "network", network);
 		iks_insert_attrib(candidate, "port", port);
-		iks_insert_attrib(candidate, "username", tmp->username);
-		iks_insert_attrib(candidate, "password", tmp->password);
-		iks_insert_attrib(candidate, "preference", preference);
-		if (tmp->protocol == AJI_PROTOCOL_UDP)
+		iks_insert_attrib(candidate, "priority", priority);
+		switch (tmp->protocol) {
+		case AJI_PROTOCOL_UDP:
 			iks_insert_attrib(candidate, "protocol", "udp");
-		if (tmp->protocol == AJI_PROTOCOL_SSLTCP)
+			break;
+		case AJI_PROTOCOL_SSLTCP:
 			iks_insert_attrib(candidate, "protocol", "ssltcp");
-		if (tmp->type == AJI_CONNECT_STUN)
-			iks_insert_attrib(candidate, "type", "stun");
-		if (tmp->type == AJI_CONNECT_LOCAL)
-			iks_insert_attrib(candidate, "type", "local");
-		if (tmp->type == AJI_CONNECT_RELAY)
+			break;
+		}
+		iks_insert_attrib(candidate, "pwd", tmp->password);
+		switch (tmp->type) {
+		case AJI_CONNECT_HOST:
+			iks_insert_attrib(candidate, "type", "host");
+			break;
+		case AJI_CONNECT_PRFLX:
+			iks_insert_attrib(candidate, "type", "prflx");
+			break;
+		case AJI_CONNECT_RELAY:
 			iks_insert_attrib(candidate, "type", "relay");
-		iks_insert_attrib(candidate, "network", "0");
-		iks_insert_attrib(candidate, "generation", "0");
+			break;
+		case AJI_CONNECT_SRFLX:
+			iks_insert_attrib(candidate, "type", "srflx");
+			break;
+		}
+		iks_insert_attrib(candidate, "ufrag", tmp->ufrag);
+
 		iks_send(c->p, iq);
 	}
 	p->laststun = 0;
@@ -702,6 +740,10 @@
 		iks_delete(iq);
 	if (jingle)
 		iks_delete(jingle);
+	if (content)
+		iks_delete(content);
+	if (transport)
+		iks_delete(transport);
 	if (candidate)
 		iks_delete(candidate);
 	return 1;
@@ -851,29 +893,31 @@
 
 static int jingle_action(struct jingle *client, struct jingle_pvt *p, const char *action)
 {
-	iks *request, *session = NULL;
+	iks *iq, *jingle = NULL;
 	int res = -1;
 
-	request = iks_new("iq");
-	if (request) {
-		iks_insert_attrib(request, "type", "set");
-		iks_insert_attrib(request, "from", client->connection->jid->full);
-		iks_insert_attrib(request, "to", p->from);
-		iks_insert_attrib(request, "id", client->connection->mid);
+	iq = iks_new("iq");
+	jingle = iks_new("jingle");
+	
+	if (iq) {
+		iks_insert_attrib(iq, "type", "set");
+		iks_insert_attrib(iq, "from", client->connection->jid->full);
+		iks_insert_attrib(iq, "to", p->from);
+		iks_insert_attrib(iq, "id", client->connection->mid);
 		ast_aji_increment_mid(client->connection->mid);
-		session = iks_new("session");
-		if (session) {
-			iks_insert_attrib(session, "type", action);
-			iks_insert_attrib(session, "id", p->sid);
-			iks_insert_attrib(session, "initiator",
-							  p->initiator ? client->connection->jid->full : p->from);
-			iks_insert_attrib(session, "xmlns", JINGLE_NS);
-			iks_insert_node(request, session);
-			iks_send(client->connection->p, request);
-			iks_delete(session);
+		if (jingle) {
+			iks_insert_attrib(jingle, "action", action);
+			iks_insert_attrib(jingle, JINGLE_SID, p->sid);
+			iks_insert_attrib(jingle, "initiator", p->initiator ? client->connection->jid->full : p->from);
+			iks_insert_attrib(jingle, "xmlns", JINGLE_NS);
+
+			iks_insert_node(iq, jingle);
+
+			iks_send(client->connection->p, iq);
+			iks_delete(jingle);
 			res = 0;
 		}
-		iks_delete(request);
+		iks_delete(iq);
 	}
 	return res;
 }
@@ -921,7 +965,7 @@
 	struct jingle_pvt *p, *tmp = client->p;
 	struct ast_channel *chan;
 	int res;
-	iks *codec;
+	iks *payload_type;
 
 	/* Make sure our new call doesn't exist yet */
 	while (tmp) {
@@ -947,14 +991,13 @@
 							sizeof(p->sid));
 		}
 
-		codec = iks_child(iks_child(iks_child(pak->x)));
-		while (codec) {
-			ast_rtp_set_m_type(p->rtp, atoi(iks_find_attrib(codec, "id")));
-			ast_rtp_set_rtpmap_type(p->rtp, atoi(iks_find_attrib(codec, "id")), "audio",
-						iks_find_attrib(codec, "name"), 0);
-			codec = iks_next(codec);
-		}
-		
+		payload_type = iks_child(iks_child(iks_child(iks_child(pak->x))));
+		while (payload_type) {
+			ast_rtp_set_m_type(p->rtp, atoi(iks_find_attrib(payload_type, "id")));
+			ast_rtp_set_rtpmap_type(p->rtp, atoi(iks_find_attrib(payload_type, "id")), "audio", iks_find_attrib(payload_type, "name"), 0);
+			payload_type = iks_next(payload_type);
+		}
+
 		ast_mutex_unlock(&p->lock);
 		ast_setstate(chan, AST_STATE_RING);
 		res = ast_pbx_start(chan);
@@ -971,8 +1014,8 @@
 		case AST_PBX_SUCCESS:
 			jingle_response(client, pak, NULL, NULL);
 			jingle_create_candidates(client, p,
-					iks_find_attrib(pak->query, JINGLE_SID),
-					iks_find_attrib(pak->x, "from"));
+						 iks_find_attrib(pak->query, JINGLE_SID),
+						 iks_find_attrib(pak->x, "from"));
 			/* nothing to do */
 			break;
 		}
@@ -1000,8 +1043,7 @@
 		sin.sin_family = AF_INET;
 		memcpy(&sin.sin_addr, hp->h_addr, sizeof(sin.sin_addr));
 		sin.sin_port = htons(tmp->port);
-		snprintf(username, sizeof(username), "%s%s", tmp->username,
-				 p->ourcandidates->username);
+		snprintf(username, sizeof(username), "%s:%s", tmp->ufrag, p->ourcandidates->ufrag);
 
 		ast_rtp_stun_request(p->rtp, &sin, username);
 		tmp = tmp->next;
@@ -1038,29 +1080,26 @@
 			newcandidate = ast_calloc(1, sizeof(*newcandidate));
 			if (!newcandidate)
 				return 0;
-			ast_copy_string(newcandidate->name, iks_find_attrib(traversenodes, "name"),
-							sizeof(newcandidate->name));
 			ast_copy_string(newcandidate->ip, iks_find_attrib(traversenodes, "address"),
 							sizeof(newcandidate->ip));
 			newcandidate->port = atoi(iks_find_attrib(traversenodes, "port"));
-			ast_copy_string(newcandidate->username, iks_find_attrib(traversenodes, "username"),
-							sizeof(newcandidate->username));
 			ast_copy_string(newcandidate->password, iks_find_attrib(traversenodes, "password"),
 							sizeof(newcandidate->password));
-			newcandidate->preference = atof(iks_find_attrib(traversenodes, "preference"));
 			if (!strcasecmp(iks_find_attrib(traversenodes, "protocol"), "udp"))
 				newcandidate->protocol = AJI_PROTOCOL_UDP;
 			if (!strcasecmp(iks_find_attrib(traversenodes, "protocol"), "ssltcp"))
 				newcandidate->protocol = AJI_PROTOCOL_SSLTCP;
 		
-			if (!strcasecmp(iks_find_attrib(traversenodes, "type"), "stun"))
-				newcandidate->type = AJI_CONNECT_STUN;
-			if (!strcasecmp(iks_find_attrib(traversenodes, "type"), "local"))
-				newcandidate->type = AJI_CONNECT_LOCAL;
+			if (!strcasecmp(iks_find_attrib(traversenodes, "type"), "host"))
+				newcandidate->type = AJI_CONNECT_HOST;
+			if (!strcasecmp(iks_find_attrib(traversenodes, "type"), "prflx"))
+				newcandidate->type = AJI_CONNECT_PRFLX;
 			if (!strcasecmp(iks_find_attrib(traversenodes, "type"), "relay"))
 				newcandidate->type = AJI_CONNECT_RELAY;
-			ast_copy_string(newcandidate->network, iks_find_attrib(traversenodes, "network"),
-							sizeof(newcandidate->network));
+			if (!strcasecmp(iks_find_attrib(traversenodes, "type"), "srflx"))
+				newcandidate->type = AJI_CONNECT_SRFLX;
+
+			newcandidate->network = atoi(iks_find_attrib(traversenodes, "network"));
 			newcandidate->generation = atoi(iks_find_attrib(traversenodes, "generation"));
 			newcandidate->next = NULL;
 		
@@ -1292,7 +1331,7 @@
 	iks_insert_attrib(jingle, "initiator", client->jid->full);
 	iks_insert_attrib(jingle, "xmlns", JINGLE_NS);
 	iks_insert_attrib(content, "creator", "initiator");
-	iks_insert_attrib(content, "name", "Asterisk audio content");
+	iks_insert_attrib(content, "name", "asterisk-audio-content");
 	iks_insert_attrib(content, "profile", "RTP/AVP");
 	iks_insert_attrib(description, "xmlns", JINGLE_AUDIO_RTP_NS);
 	iks_insert_attrib(transport, "xmlns", JINGLE_ICE_UDP_NS);
@@ -1375,7 +1414,7 @@
 	p->owner = NULL;
 	ast->tech_pvt = NULL;
 	if (!p->alreadygone)
-		jingle_action(client, p, "terminate");
+		jingle_action(client, p, JINGLE_TERMINATE);
 	ast_mutex_unlock(&p->lock);
 
 	jingle_free_pvt(client, p);
@@ -1452,21 +1491,22 @@
 static int jingle_parser(void *data, ikspak *pak)
 {
 	struct jingle *client = ASTOBJ_REF((struct jingle *) data);
-
-	if (iks_find_with_attrib(pak->x, JINGLE_NODE, "type", JINGLE_INITIATE)) {
+	ast_log(LOG_NOTICE, "Filter matched\n");
+
+	if (iks_find_with_attrib(pak->x, JINGLE_NODE, "action", JINGLE_INITIATE)) {
 		/* New call */
 		jingle_newcall(client, pak);
-	} else if (iks_find_with_attrib(pak->x, JINGLE_NODE, "type", JINGLE_NEGOTIATE)) {
+	} else if (iks_find_with_attrib(pak->x, JINGLE_NODE, "action", JINGLE_NEGOTIATE)) {
 		ast_debug(3, "About to add candidate!\n");
 		jingle_add_candidate(client, pak);
 		ast_debug(3, "Candidate Added!\n");
-	} else if (iks_find_with_attrib(pak->x, JINGLE_NODE, "type", JINGLE_ACCEPT)) {
+	} else if (iks_find_with_attrib(pak->x, JINGLE_NODE, "action", JINGLE_ACCEPT)) {
 		jingle_is_answered(client, pak);
-	} else if (iks_find_with_attrib(pak->x, JINGLE_NODE, "action", "session-info")) {
+	} else if (iks_find_with_attrib(pak->x, JINGLE_NODE, "action", JINGLE_INFO)) {
 		jingle_handle_dtmf(client, pak);
-	} else if (iks_find_with_attrib(pak->x, JINGLE_NODE, "type", "terminate")) {
+	} else if (iks_find_with_attrib(pak->x, JINGLE_NODE, "action", JINGLE_TERMINATE)) {
 		jingle_hangup_farend(client, pak);
-	} else if (iks_find_with_attrib(pak->x, JINGLE_NODE, "type", "reject")) {
+	} else if (iks_find_with_attrib(pak->x, JINGLE_NODE, "action", "reject")) {
 		jingle_hangup_farend(client, pak);
 	}
 	ASTOBJ_UNREF(client, jingle_member_destroy);
@@ -1507,12 +1547,14 @@
 			res->protocol = AJI_PROTOCOL_SSLTCP;
 	}
 	if (type) {
-		if (!strcasecmp("stun", type))
-			res->type = AJI_CONNECT_STUN;
-		if (!strcasecmp("local", type))
-			res->type = AJI_CONNECT_LOCAL;
+		if (!strcasecmp("host", type))
+			res->type = AJI_CONNECT_HOST;
+		if (!strcasecmp("prflx", type))
+			res->type = AJI_CONNECT_PRFLX;
 		if (!strcasecmp("relay", type))
 			res->type = AJI_CONNECT_RELAY;
+		if (!strcasecmp("srflx", type))
+			res->type = AJI_CONNECT_SRFLX;
 	}
 
 	return res;
@@ -1585,6 +1627,8 @@
 	int allowguest = 1;
 	struct ast_variable *var;
 	struct jingle *member;
+	struct hostent *hp;
+	struct ast_hostent ahp;
 	struct ast_codec_pref prefs;
 	struct aji_client_container *clients;
 	struct jingle_candidate *global_candidates = NULL;
@@ -1614,6 +1658,13 @@
 			ast_copy_string(context, var->value, sizeof(context));
 		else if (!strcasecmp(var->name, "externip"))
 			ast_copy_string(externip, var->value, sizeof(externip));
+		else if (!strcasecmp(var->name, "bindaddr")) {
+			if (!(hp = ast_gethostbyname(var->value, &ahp))) {
+				ast_log(LOG_WARNING, "Invalid address: %s\n", var->value);
+			} else {
+				memcpy(&bindaddr.sin_addr, hp->h_addr, sizeof(bindaddr.sin_addr));
+			}
+		}
 /*  Idea to allow for custom candidates  */
 /*
 		else if (!strcasecmp(var->name, "candidate")) {

Modified: team/group/zapata_conf/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/zapata_conf/channels/chan_sip.c?view=diff&rev=84136&r1=84135&r2=84136
==============================================================================
--- team/group/zapata_conf/channels/chan_sip.c (original)
+++ team/group/zapata_conf/channels/chan_sip.c Sat Sep 29 18:34:18 2007
@@ -553,6 +553,8 @@
 #define DEFAULT_MAX_CALL_BITRATE (384)		/*!< Max bitrate for video */
 #ifndef DEFAULT_USERAGENT
 #define DEFAULT_USERAGENT "Asterisk PBX"	/*!< Default Useragent: header unless re-defined in sip.conf */
+#define DEFAULT_SDPSESSION "Asterisk PBX"	/*!< Default SDP session name, (s=) header unless re-defined in sip.conf */

[... 1100 lines stripped ...]

