[svn-commits] pcadach: branch pcadach/chan_h323-live r39963 - in /team/pcadach/chan_h323-li...

[svn-commits at lists.digium.com]

Author: pcadach
Date: Tue Aug 15 21:26:28 2006
New Revision: 39963

URL: http://svn.digium.com/view/asterisk?rev=39963&view=rev
Log:
Resolve auto-merge conflict

Modified:
    team/pcadach/chan_h323-live/   (props changed)
    team/pcadach/chan_h323-live/channels/chan_sip.c
    team/pcadach/chan_h323-live/res/res_agi.c

Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 15 21:26:28 2006
@@ -1,1 +1,1 @@
-/trunk:1-39928
+/trunk:1-39962

Modified: team/pcadach/chan_h323-live/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/channels/chan_sip.c?rev=39963&r1=39962&r2=39963&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/channels/chan_sip.c (original)
+++ team/pcadach/chan_h323-live/channels/chan_sip.c Tue Aug 15 21:26:28 2006
@@ -3331,8 +3331,15 @@
 	switch (frame->frametype) {
 	case AST_FRAME_VOICE:
 		if (!(frame->subclass & ast->nativeformats)) {
-			ast_log(LOG_WARNING, "Asked to transmit frame type %d, while native formats is %d (read/write = %d/%d)\n",
-				frame->subclass, ast->nativeformats, ast->readformat, ast->writeformat);
+			char s1[512], s2[512], s3[512];
+			ast_log(LOG_WARNING, "Asked to transmit frame type %d, while native formats is %s(%d) read/write = %s(%d)/%s(%d)\n",
+				frame->subclass, 
+				ast_getformatname_multiple(s1, sizeof(s1) - 1, ast->nativeformats & AST_FORMAT_AUDIO_MASK),
+				ast->nativeformats & AST_FORMAT_AUDIO_MASK,
+				ast_getformatname_multiple(s2, sizeof(s2) - 1, ast->readformat),
+				ast->readformat,
+				ast_getformatname_multiple(s3, sizeof(s3) - 1, ast->writeformat),
+				ast->writeformat);
 			return 0;
 		}
 		if (p) {
@@ -9686,7 +9693,6 @@
 		ast_cli(fd, "%s\n", codec_buf);
 		ast_cli(fd, "  Codec Order  : (");
 		print_codec_to_cli(fd, &peer->prefs);
-
 		ast_cli(fd, ")\n");
 
 		ast_cli(fd, "  Status       : ");
@@ -9789,9 +9795,8 @@
 {
 	char cbuf[256];
 	struct sip_user *user;
-	struct ast_codec_pref *pref;
 	struct ast_variable *v;
-	int x = 0, codec = 0, load_realtime;
+	int load_realtime;
 
 	if (argc < 4)
 		return RESULT_SHOWUSAGE;
@@ -9821,18 +9826,7 @@
 		ast_cli(fd, "  Callerid     : %s\n", ast_callerid_merge(cbuf, sizeof(cbuf), user->cid_name, user->cid_num, "<unspecified>"));
 		ast_cli(fd, "  ACL          : %s\n", (user->ha?"Yes":"No"));
 		ast_cli(fd, "  Codec Order  : (");
-		pref = &user->prefs;
-		for(x = 0; x < 32 ; x++) {
-			codec = ast_codec_pref_index(pref,x);
-			if (!codec)
-				break;
-			ast_cli(fd, "%s", ast_getformatname(codec));
-			if (x < 31 && ast_codec_pref_index(pref,x+1))
-				ast_cli(fd, "|");
-		}
-
-		if (!x)
-			ast_cli(fd, "none");
+		print_codec_to_cli(fd, &user->prefs);
 		ast_cli(fd, ")\n");
 
 		if (user->chanvars) {

Modified: team/pcadach/chan_h323-live/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/res/res_agi.c?rev=39963&r1=39962&r2=39963&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/res/res_agi.c (original)
+++ team/pcadach/chan_h323-live/res/res_agi.c Tue Aug 15 21:26:28 2006
@@ -1166,18 +1166,17 @@
 
 static int handle_getvariable(struct ast_channel *chan, AGI *agi, int argc, char **argv)
 {
-	char *ret;
+	const char *ret;
 	char tempstr[1024];
 
 	if (argc != 3)
 		return RESULT_SHOWUSAGE;
 
 	/* check if we want to execute an ast_custom_function */
-	if (!ast_strlen_zero(argv[2]) && (argv[2][strlen(argv[2]) - 1] == ')')) {
+	if (!ast_strlen_zero(argv[2]) && (argv[2][strlen(argv[2]) - 1] == ')'))
 		ret = ast_func_read(chan, argv[2], tempstr, sizeof(tempstr)) ? NULL : tempstr;
-	} else {
-		pbx_retrieve_variable(chan, argv[2], &ret, tempstr, sizeof(tempstr), NULL);
-	}
+	else
+		ret = pbx_builtin_getvar_helper(chan, argv[2]);
 
 	if (ret)
 		fdprintf(agi->fd, "200 result=1 (%s)\n", ret);