[svn-commits] mmichelson: branch group/CCSS r246629 - /team/group/CCSS/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Feb 15 10:16:20 2010
New Revision: 246629

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=246629
Log:
Fix compilation error and add new device naming scheme for SIP devices.


Modified:
    team/group/CCSS/channels/chan_sip.c

Modified: team/group/CCSS/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/channels/chan_sip.c?view=diff&rev=246629&r1=246628&r2=246629
==============================================================================
--- team/group/CCSS/channels/chan_sip.c (original)
+++ team/group/CCSS/channels/chan_sip.c Mon Feb 15 10:16:20 2010
@@ -2540,7 +2540,7 @@
 		 * refcount once the monitor destructor is called
 		 */
 		ast_module_ref(ast_module_info->self);
-		ast_queue_cc_frame(pvt->owner, "SIP", p->dialstring, offered_service, monitor_instance);
+		ast_queue_cc_frame(pvt->owner, "SIP", pvt->dialstring, offered_service, monitor_instance);
 		ao2_ref(monitor_instance, -1);
 		return;
 	}
@@ -4320,6 +4320,16 @@
 		cp = (char *) data;
 		*cp = p->dsp ? 1 : 0;
 		ast_debug(1, "Reporting digit detection %sabled on %s\n", *cp ? "en" : "dis", chan->name);
+		break;
+	case AST_OPTION_DEVICE_NAME:
+		if (p && ast_test_flag(&p->flags[0], SIP_OUTGOING)) {
+			cp = (char *) data;
+			ast_copy_string(cp, p->dialstring, *datalen);
+			res = 0;
+		}
+		/* We purposely break with a return of -1 in the
+		 * implied else case here
+		 */
 		break;
 	default:
 		break;