[svn-commits] rmudgett: branch group/issue14068 r195213 - /team/group/issue14068/channels/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Mon May 18 10:59:36 2009
New Revision: 195213

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=195213
Log:
Replaced PRI_EVENT_FACNAME with PRI_EVENT_FACILITY and adjusted the new
event to maintain backward compatibility.

Modified:
    team/group/issue14068/channels/chan_dahdi.c

Modified: team/group/issue14068/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/issue14068/channels/chan_dahdi.c?view=diff&rev=195213&r1=195212&r2=195213
==============================================================================
--- team/group/issue14068/channels/chan_dahdi.c (original)
+++ team/group/issue14068/channels/chan_dahdi.c Mon May 18 10:59:36 2009
@@ -13648,27 +13648,9 @@
 					}
 				}
 				break;
-			case PRI_EVENT_FACNAME:
-				chanpos = pri_find_principle(pri, e->facname.channel);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "Facility Name requested on unconfigured channel %d/%d span %d\n",
-						PRI_SPAN(e->facname.channel), PRI_CHANNEL(e->facname.channel), pri->span);
-				} else {
-					chanpos = pri_fixup_principle(pri, chanpos, e->facname.call);
-					if (chanpos < 0) {
-						ast_log(LOG_WARNING, "Facility Name requested on channel %d/%d not in use on span %d\n",
-							PRI_SPAN(e->facname.channel), PRI_CHANNEL(e->facname.channel), pri->span);
-					} else {
-						/* Re-use *69 field for PRI */
-						ast_mutex_lock(&pri->pvts[chanpos]->lock);
-						ast_copy_string(pri->pvts[chanpos]->lastcid_num, e->facname.callingnum, sizeof(pri->pvts[chanpos]->lastcid_num));
-						ast_copy_string(pri->pvts[chanpos]->lastcid_name, e->facname.callingname, sizeof(pri->pvts[chanpos]->lastcid_name));
-						pri->pvts[chanpos]->subs[SUB_REAL].needcallerid = 1;
-						dahdi_enable_ec(pri->pvts[chanpos]);
-						ast_mutex_unlock(&pri->pvts[chanpos]->lock);
-					}
-				}
-				break;
+#ifndef PRI_EVENT_FACILITY
+#error please update libpri
+#endif
 			case PRI_EVENT_FACILITY:
 				chanpos = pri_find_principle(pri, e->facility.channel);
 				if (chanpos < 0) {